From 91af6aa3855c45e8c331331c2f2b72472b1b22fe Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Mon, 29 Jul 2024 07:00:12 +0200 Subject: [PATCH] Still more moves --- include/sqlpp11/clause/cte.h | 4 ++-- include/sqlpp11/clause/for_update.h | 2 +- include/sqlpp11/clause/from.h | 2 +- include/sqlpp11/clause/group_by.h | 2 +- include/sqlpp11/clause/having.h | 2 +- include/sqlpp11/clause/insert.h | 6 +++--- include/sqlpp11/clause/insert_value_list.h | 4 ++-- include/sqlpp11/clause/into.h | 4 ++-- include/sqlpp11/clause/limit.h | 2 +- include/sqlpp11/clause/offset.h | 2 +- include/sqlpp11/clause/order_by.h | 2 +- include/sqlpp11/clause/remove.h | 6 +++--- include/sqlpp11/clause/select.h | 4 ++-- include/sqlpp11/clause/select_column_list.h | 6 +++--- include/sqlpp11/clause/select_column_traits.h | 2 +- include/sqlpp11/clause/select_flag_list.h | 2 +- include/sqlpp11/clause/union.h | 4 ++-- include/sqlpp11/clause/update.h | 6 +++--- include/sqlpp11/clause/using.h | 2 +- include/sqlpp11/clause/where.h | 2 +- include/sqlpp11/clause/with.h | 4 ++-- include/sqlpp11/{ => database}/connection.h | 0 include/sqlpp11/{ => database}/connection_pool.h | 2 +- include/sqlpp11/{ => database}/exception.h | 0 include/sqlpp11/{ => database}/prepared_execute.h | 0 include/sqlpp11/{ => database}/prepared_insert.h | 0 include/sqlpp11/{ => database}/prepared_remove.h | 0 include/sqlpp11/{ => database}/prepared_select.h | 0 include/sqlpp11/{ => database}/prepared_update.h | 0 include/sqlpp11/{ => database}/serializer_context.h | 0 include/sqlpp11/{ => database}/transaction.h | 0 include/sqlpp11/function.h | 4 ++-- include/sqlpp11/mysql/bind_result.h | 2 +- include/sqlpp11/mysql/char_result.h | 2 +- include/sqlpp11/mysql/connection.h | 4 ++-- include/sqlpp11/mysql/connection_pool.h | 4 ++-- include/sqlpp11/mysql/mysql.h | 4 ++-- include/sqlpp11/no_data.h | 1 + include/sqlpp11/noop.h | 2 +- include/sqlpp11/operator/any.h | 2 +- include/sqlpp11/{ => operator}/case.h | 0 include/sqlpp11/operator/logical_expression.h | 2 +- include/sqlpp11/postgresql/connection.h | 6 +++--- include/sqlpp11/postgresql/connection_pool.h | 4 ++-- include/sqlpp11/postgresql/exception.h | 2 +- include/sqlpp11/postgresql/on_conflict.h | 2 +- include/sqlpp11/postgresql/postgresql.h | 6 +++--- include/sqlpp11/postgresql/prepared_statement.h | 2 +- include/sqlpp11/postgresql/result.h | 2 +- include/sqlpp11/postgresql/returning.h | 2 +- include/sqlpp11/postgresql/returning_column_list.h | 4 ++-- include/sqlpp11/{ => query}/custom_query.h | 4 ++-- include/sqlpp11/{ => query}/dynamic.h | 0 include/sqlpp11/{ => query}/policy_update.h | 0 include/sqlpp11/{ => query}/result_row.h | 2 +- include/sqlpp11/{ => query}/result_row_fwd.h | 0 include/sqlpp11/{ => query}/statement.h | 6 +++--- include/sqlpp11/{ => query}/statement_fwd.h | 0 include/sqlpp11/single_table.h | 2 +- include/sqlpp11/sqlite3/bind_result.h | 2 +- include/sqlpp11/sqlite3/connection.h | 6 +++--- include/sqlpp11/sqlite3/connection_pool.h | 4 ++-- include/sqlpp11/sqlite3/insert_or.h | 4 ++-- include/sqlpp11/sqlite3/prepared_statement.h | 2 +- include/sqlpp11/sqlite3/sqlite3.h | 4 ++-- include/sqlpp11/sqlpp11.h | 4 ++-- tests/core/serialize/CustomQuery.cpp | 2 +- tests/core/static_asserts/aggregates.cpp | 2 +- tests/core/usage/CustomQuery.cpp | 10 +++++----- tests/core/usage/Function.cpp | 2 +- tests/core/usage/MockDb.h | 6 +++--- tests/core/usage/Prepared.cpp | 2 +- tests/core/usage/Select.cpp | 2 +- tests/core/usage/SelectType.cpp | 2 +- tests/core/usage/With.cpp | 6 +++--- tests/mysql/serialize/compare.h | 2 +- tests/mysql/usage/Connection.cpp | 2 +- tests/mysql/usage/CustomQuery.cpp | 2 +- tests/mysql/usage/DynamicSelect.cpp | 4 ++-- tests/mysql/usage/Json.cpp | 4 ++-- tests/mysql/usage/MoveConstructor.cpp | 4 ++-- tests/mysql/usage/Prepared.cpp | 4 ++-- tests/mysql/usage/Select.cpp | 4 ++-- tests/mysql/usage/Truncated.cpp | 4 ++-- tests/mysql/usage/Union.cpp | 2 +- tests/postgresql/serialize/compare.h | 2 +- tests/postgresql/usage/Basic.cpp | 4 ++-- tests/postgresql/usage/BasicConstConfig.cpp | 4 ++-- tests/postgresql/usage/Connection.cpp | 2 +- tests/postgresql/usage/Date.cpp | 2 +- tests/postgresql/usage/DateTime.cpp | 2 +- tests/postgresql/usage/Exceptions.cpp | 4 ++-- tests/postgresql/usage/Transaction.cpp | 6 +++--- tests/postgresql/usage/Type.cpp | 2 +- tests/sqlite3/serialize/compare.h | 2 +- tests/sqlite3/usage/Attach.cpp | 2 +- tests/sqlite3/usage/AutoIncrement.cpp | 2 +- tests/sqlite3/usage/Blob.cpp | 4 ++-- tests/sqlite3/usage/Connection.cpp | 2 +- tests/sqlite3/usage/DateTime.cpp | 2 +- tests/sqlite3/usage/DynamicLoadingTest.cpp | 4 ++-- tests/sqlite3/usage/DynamicSelect.cpp | 4 ++-- tests/sqlite3/usage/Execute.cpp | 2 +- tests/sqlite3/usage/FloatingPoint.cpp | 2 +- tests/sqlite3/usage/Integral.cpp | 2 +- tests/sqlite3/usage/Sample.cpp | 2 +- tests/sqlite3/usage/Select.cpp | 4 ++-- tests/sqlite3/usage/Transaction.cpp | 6 +++--- tests/sqlite3/usage/Union.cpp | 2 +- tests/sqlite3/usage/With.cpp | 2 +- 110 files changed, 154 insertions(+), 153 deletions(-) rename include/sqlpp11/{ => database}/connection.h (100%) rename include/sqlpp11/{ => database}/connection_pool.h (99%) rename include/sqlpp11/{ => database}/exception.h (100%) rename include/sqlpp11/{ => database}/prepared_execute.h (100%) rename include/sqlpp11/{ => database}/prepared_insert.h (100%) rename include/sqlpp11/{ => database}/prepared_remove.h (100%) rename include/sqlpp11/{ => database}/prepared_select.h (100%) rename include/sqlpp11/{ => database}/prepared_update.h (100%) rename include/sqlpp11/{ => database}/serializer_context.h (100%) rename include/sqlpp11/{ => database}/transaction.h (100%) rename include/sqlpp11/{ => operator}/case.h (100%) rename include/sqlpp11/{ => query}/custom_query.h (98%) rename include/sqlpp11/{ => query}/dynamic.h (100%) rename include/sqlpp11/{ => query}/policy_update.h (100%) rename include/sqlpp11/{ => query}/result_row.h (99%) rename include/sqlpp11/{ => query}/result_row_fwd.h (100%) rename include/sqlpp11/{ => query}/statement.h (99%) rename include/sqlpp11/{ => query}/statement_fwd.h (100%) diff --git a/include/sqlpp11/clause/cte.h b/include/sqlpp11/clause/cte.h index f72ae2ba..25b4ae1c 100644 --- a/include/sqlpp11/clause/cte.h +++ b/include/sqlpp11/clause/cte.h @@ -29,9 +29,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/include/sqlpp11/clause/for_update.h b/include/sqlpp11/clause/for_update.h index 171ebdbe..63eccb81 100644 --- a/include/sqlpp11/clause/for_update.h +++ b/include/sqlpp11/clause/for_update.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/from.h b/include/sqlpp11/clause/from.h index ebbfa7cc..f5f67958 100644 --- a/include/sqlpp11/clause/from.h +++ b/include/sqlpp11/clause/from.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/sqlpp11/clause/group_by.h b/include/sqlpp11/clause/group_by.h index 205bc0dd..c5f19af9 100644 --- a/include/sqlpp11/clause/group_by.h +++ b/include/sqlpp11/clause/group_by.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/sqlpp11/clause/having.h b/include/sqlpp11/clause/having.h index 0dc8ca00..2acf68c9 100644 --- a/include/sqlpp11/clause/having.h +++ b/include/sqlpp11/clause/having.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/include/sqlpp11/clause/insert.h b/include/sqlpp11/clause/insert.h index 5d01845f..e0c24072 100644 --- a/include/sqlpp11/clause/insert.h +++ b/include/sqlpp11/clause/insert.h @@ -26,11 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/insert_value_list.h b/include/sqlpp11/clause/insert_value_list.h index 1a715eb7..e624bc37 100644 --- a/include/sqlpp11/clause/insert_value_list.h +++ b/include/sqlpp11/clause/insert_value_list.h @@ -32,10 +32,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/into.h b/include/sqlpp11/clause/into.h index 27c58743..2674794d 100644 --- a/include/sqlpp11/clause/into.h +++ b/include/sqlpp11/clause/into.h @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/limit.h b/include/sqlpp11/clause/limit.h index fd72ca6c..4d20e167 100644 --- a/include/sqlpp11/clause/limit.h +++ b/include/sqlpp11/clause/limit.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/offset.h b/include/sqlpp11/clause/offset.h index ff151882..d4d8f87c 100644 --- a/include/sqlpp11/clause/offset.h +++ b/include/sqlpp11/clause/offset.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/order_by.h b/include/sqlpp11/clause/order_by.h index f3eb33e3..88b04ec8 100644 --- a/include/sqlpp11/clause/order_by.h +++ b/include/sqlpp11/clause/order_by.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/sqlpp11/clause/remove.h b/include/sqlpp11/clause/remove.h index 7edc5b26..23de8cc4 100644 --- a/include/sqlpp11/clause/remove.h +++ b/include/sqlpp11/clause/remove.h @@ -26,11 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/select.h b/include/sqlpp11/clause/select.h index 7a8adceb..1061a75c 100644 --- a/include/sqlpp11/clause/select.h +++ b/include/sqlpp11/clause/select.h @@ -26,10 +26,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/select_column_list.h b/include/sqlpp11/clause/select_column_list.h index 1e1d64d4..05784603 100644 --- a/include/sqlpp11/clause/select_column_list.h +++ b/include/sqlpp11/clause/select_column_list.h @@ -28,11 +28,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/sqlpp11/clause/select_column_traits.h b/include/sqlpp11/clause/select_column_traits.h index c7063bb8..c57a097a 100644 --- a/include/sqlpp11/clause/select_column_traits.h +++ b/include/sqlpp11/clause/select_column_traits.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include // Select columns require a value type and a name. diff --git a/include/sqlpp11/clause/select_flag_list.h b/include/sqlpp11/clause/select_flag_list.h index 5dc346ac..21f80226 100644 --- a/include/sqlpp11/clause/select_flag_list.h +++ b/include/sqlpp11/clause/select_flag_list.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/union.h b/include/sqlpp11/clause/union.h index 9352abcf..d3f058d8 100644 --- a/include/sqlpp11/clause/union.h +++ b/include/sqlpp11/clause/union.h @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/sqlpp11/clause/update.h b/include/sqlpp11/clause/update.h index 8b408237..9eaead4b 100644 --- a/include/sqlpp11/clause/update.h +++ b/include/sqlpp11/clause/update.h @@ -26,11 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/using.h b/include/sqlpp11/clause/using.h index d731cd38..e1be965f 100644 --- a/include/sqlpp11/clause/using.h +++ b/include/sqlpp11/clause/using.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/clause/where.h b/include/sqlpp11/clause/where.h index 5d5b762c..021790c5 100644 --- a/include/sqlpp11/clause/where.h +++ b/include/sqlpp11/clause/where.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/clause/with.h b/include/sqlpp11/clause/with.h index 7c9474ae..62a8da82 100644 --- a/include/sqlpp11/clause/with.h +++ b/include/sqlpp11/clause/with.h @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/include/sqlpp11/connection.h b/include/sqlpp11/database/connection.h similarity index 100% rename from include/sqlpp11/connection.h rename to include/sqlpp11/database/connection.h diff --git a/include/sqlpp11/connection_pool.h b/include/sqlpp11/database/connection_pool.h similarity index 99% rename from include/sqlpp11/connection_pool.h rename to include/sqlpp11/database/connection_pool.h index 5d70a270..b12724ea 100644 --- a/include/sqlpp11/connection_pool.h +++ b/include/sqlpp11/database/connection_pool.h @@ -27,7 +27,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/include/sqlpp11/exception.h b/include/sqlpp11/database/exception.h similarity index 100% rename from include/sqlpp11/exception.h rename to include/sqlpp11/database/exception.h diff --git a/include/sqlpp11/prepared_execute.h b/include/sqlpp11/database/prepared_execute.h similarity index 100% rename from include/sqlpp11/prepared_execute.h rename to include/sqlpp11/database/prepared_execute.h diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/database/prepared_insert.h similarity index 100% rename from include/sqlpp11/prepared_insert.h rename to include/sqlpp11/database/prepared_insert.h diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/database/prepared_remove.h similarity index 100% rename from include/sqlpp11/prepared_remove.h rename to include/sqlpp11/database/prepared_remove.h diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/database/prepared_select.h similarity index 100% rename from include/sqlpp11/prepared_select.h rename to include/sqlpp11/database/prepared_select.h diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/database/prepared_update.h similarity index 100% rename from include/sqlpp11/prepared_update.h rename to include/sqlpp11/database/prepared_update.h diff --git a/include/sqlpp11/serializer_context.h b/include/sqlpp11/database/serializer_context.h similarity index 100% rename from include/sqlpp11/serializer_context.h rename to include/sqlpp11/database/serializer_context.h diff --git a/include/sqlpp11/transaction.h b/include/sqlpp11/database/transaction.h similarity index 100% rename from include/sqlpp11/transaction.h rename to include/sqlpp11/database/transaction.h diff --git a/include/sqlpp11/function.h b/include/sqlpp11/function.h index 3b71950d..c39cca64 100644 --- a/include/sqlpp11/function.h +++ b/include/sqlpp11/function.h @@ -26,13 +26,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/mysql/bind_result.h b/include/sqlpp11/mysql/bind_result.h index d56bc585..cf2052e8 100644 --- a/include/sqlpp11/mysql/bind_result.h +++ b/include/sqlpp11/mysql/bind_result.h @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include #include diff --git a/include/sqlpp11/mysql/char_result.h b/include/sqlpp11/mysql/char_result.h index 75a35cf1..57a54234 100644 --- a/include/sqlpp11/mysql/char_result.h +++ b/include/sqlpp11/mysql/char_result.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/mysql/connection.h b/include/sqlpp11/mysql/connection.h index 94991a9c..f2e29286 100644 --- a/include/sqlpp11/mysql/connection.h +++ b/include/sqlpp11/mysql/connection.h @@ -27,9 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/mysql/connection_pool.h b/include/sqlpp11/mysql/connection_pool.h index de62390a..3473854d 100644 --- a/include/sqlpp11/mysql/connection_pool.h +++ b/include/sqlpp11/mysql/connection_pool.h @@ -27,8 +27,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace sqlpp { diff --git a/include/sqlpp11/mysql/mysql.h b/include/sqlpp11/mysql/mysql.h index 484331c4..a3a6c294 100644 --- a/include/sqlpp11/mysql/mysql.h +++ b/include/sqlpp11/mysql/mysql.h @@ -27,6 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include diff --git a/include/sqlpp11/no_data.h b/include/sqlpp11/no_data.h index 29f3124d..7814cb07 100644 --- a/include/sqlpp11/no_data.h +++ b/include/sqlpp11/no_data.h @@ -28,6 +28,7 @@ namespace sqlpp { +#warning: Is this still needed? struct no_data_t { }; diff --git a/include/sqlpp11/noop.h b/include/sqlpp11/noop.h index b17227a0..6edf95fd 100644 --- a/include/sqlpp11/noop.h +++ b/include/sqlpp11/noop.h @@ -27,7 +27,7 @@ */ #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/operator/any.h b/include/sqlpp11/operator/any.h index 24963a32..b1906825 100644 --- a/include/sqlpp11/operator/any.h +++ b/include/sqlpp11/operator/any.h @@ -26,7 +26,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/case.h b/include/sqlpp11/operator/case.h similarity index 100% rename from include/sqlpp11/case.h rename to include/sqlpp11/operator/case.h diff --git a/include/sqlpp11/operator/logical_expression.h b/include/sqlpp11/operator/logical_expression.h index 18db0653..53667c6d 100644 --- a/include/sqlpp11/operator/logical_expression.h +++ b/include/sqlpp11/operator/logical_expression.h @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include +#include #include //#include //#include diff --git a/include/sqlpp11/postgresql/connection.h b/include/sqlpp11/postgresql/connection.h index f66ee666..d055d123 100644 --- a/include/sqlpp11/postgresql/connection.h +++ b/include/sqlpp11/postgresql/connection.h @@ -33,17 +33,17 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include -#include +#include #ifdef SQLPP_DYNAMIC_LOADING #include diff --git a/include/sqlpp11/postgresql/connection_pool.h b/include/sqlpp11/postgresql/connection_pool.h index 52bba3df..41717b25 100644 --- a/include/sqlpp11/postgresql/connection_pool.h +++ b/include/sqlpp11/postgresql/connection_pool.h @@ -27,8 +27,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace sqlpp { diff --git a/include/sqlpp11/postgresql/exception.h b/include/sqlpp11/postgresql/exception.h index 174124ef..920c6d1f 100644 --- a/include/sqlpp11/postgresql/exception.h +++ b/include/sqlpp11/postgresql/exception.h @@ -32,7 +32,7 @@ */ #include "visibility.h" -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/postgresql/on_conflict.h b/include/sqlpp11/postgresql/on_conflict.h index a86aca07..5f5d2c00 100644 --- a/include/sqlpp11/postgresql/on_conflict.h +++ b/include/sqlpp11/postgresql/on_conflict.h @@ -29,7 +29,7 @@ #include #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/postgresql/postgresql.h b/include/sqlpp11/postgresql/postgresql.h index 62abb2fb..770d6bb0 100644 --- a/include/sqlpp11/postgresql/postgresql.h +++ b/include/sqlpp11/postgresql/postgresql.h @@ -28,9 +28,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/sqlpp11/postgresql/prepared_statement.h b/include/sqlpp11/postgresql/prepared_statement.h index db73eebf..9e907cf4 100644 --- a/include/sqlpp11/postgresql/prepared_statement.h +++ b/include/sqlpp11/postgresql/prepared_statement.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/postgresql/result.h b/include/sqlpp11/postgresql/result.h index a00ce295..e676ddfd 100644 --- a/include/sqlpp11/postgresql/result.h +++ b/include/sqlpp11/postgresql/result.h @@ -36,7 +36,7 @@ #include #include -#include +#include #ifdef SQLPP_DYNAMIC_LOADING #include diff --git a/include/sqlpp11/postgresql/returning.h b/include/sqlpp11/postgresql/returning.h index 72bf8ba5..5b6fdcc2 100644 --- a/include/sqlpp11/postgresql/returning.h +++ b/include/sqlpp11/postgresql/returning.h @@ -29,7 +29,7 @@ #include #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/postgresql/returning_column_list.h b/include/sqlpp11/postgresql/returning_column_list.h index 4069b107..3ca69692 100644 --- a/include/sqlpp11/postgresql/returning_column_list.h +++ b/include/sqlpp11/postgresql/returning_column_list.h @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/query/custom_query.h similarity index 98% rename from include/sqlpp11/custom_query.h rename to include/sqlpp11/query/custom_query.h index 1fc50456..b96a80f6 100644 --- a/include/sqlpp11/custom_query.h +++ b/include/sqlpp11/query/custom_query.h @@ -26,11 +26,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/dynamic.h b/include/sqlpp11/query/dynamic.h similarity index 100% rename from include/sqlpp11/dynamic.h rename to include/sqlpp11/query/dynamic.h diff --git a/include/sqlpp11/policy_update.h b/include/sqlpp11/query/policy_update.h similarity index 100% rename from include/sqlpp11/policy_update.h rename to include/sqlpp11/query/policy_update.h diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/query/result_row.h similarity index 99% rename from include/sqlpp11/result_row.h rename to include/sqlpp11/query/result_row.h index f0445cb2..d3454e47 100644 --- a/include/sqlpp11/result_row.h +++ b/include/sqlpp11/query/result_row.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace sqlpp { diff --git a/include/sqlpp11/result_row_fwd.h b/include/sqlpp11/query/result_row_fwd.h similarity index 100% rename from include/sqlpp11/result_row_fwd.h rename to include/sqlpp11/query/result_row_fwd.h diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/query/statement.h similarity index 99% rename from include/sqlpp11/statement.h rename to include/sqlpp11/query/statement.h index 0a61e209..fcfc42d5 100644 --- a/include/sqlpp11/statement.h +++ b/include/sqlpp11/query/statement.h @@ -28,11 +28,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/include/sqlpp11/statement_fwd.h b/include/sqlpp11/query/statement_fwd.h similarity index 100% rename from include/sqlpp11/statement_fwd.h rename to include/sqlpp11/query/statement_fwd.h diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h index 5c0a6ecd..1390453b 100644 --- a/include/sqlpp11/single_table.h +++ b/include/sqlpp11/single_table.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/sqlite3/bind_result.h b/include/sqlpp11/sqlite3/bind_result.h index 2c1bfd02..78e46585 100644 --- a/include/sqlpp11/sqlite3/bind_result.h +++ b/include/sqlpp11/sqlite3/bind_result.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/sqlite3/connection.h b/include/sqlpp11/sqlite3/connection.h index 842b3f5c..df1dc111 100644 --- a/include/sqlpp11/sqlite3/connection.h +++ b/include/sqlpp11/sqlite3/connection.h @@ -32,9 +32,9 @@ #else #include #endif -#include +#include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sqlpp11/sqlite3/connection_pool.h b/include/sqlpp11/sqlite3/connection_pool.h index 05a4187b..9407bfda 100644 --- a/include/sqlpp11/sqlite3/connection_pool.h +++ b/include/sqlpp11/sqlite3/connection_pool.h @@ -27,8 +27,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include namespace sqlpp { diff --git a/include/sqlpp11/sqlite3/insert_or.h b/include/sqlpp11/sqlite3/insert_or.h index 144a7658..4e1030e1 100644 --- a/include/sqlpp11/sqlite3/insert_or.h +++ b/include/sqlpp11/sqlite3/insert_or.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include namespace sqlpp diff --git a/include/sqlpp11/sqlite3/prepared_statement.h b/include/sqlpp11/sqlite3/prepared_statement.h index dc1fe563..eb7de8b9 100644 --- a/include/sqlpp11/sqlite3/prepared_statement.h +++ b/include/sqlpp11/sqlite3/prepared_statement.h @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/include/sqlpp11/sqlite3/sqlite3.h b/include/sqlpp11/sqlite3/sqlite3.h index 10480258..3a3b1c02 100644 --- a/include/sqlpp11/sqlite3/sqlite3.h +++ b/include/sqlpp11/sqlite3/sqlite3.h @@ -27,6 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include diff --git a/include/sqlpp11/sqlpp11.h b/include/sqlpp11/sqlpp11.h index d8496f41..693f99c9 100644 --- a/include/sqlpp11/sqlpp11.h +++ b/include/sqlpp11/sqlpp11.h @@ -33,6 +33,6 @@ #include #include #include -#include +#include #include -#include +#include diff --git a/tests/core/serialize/CustomQuery.cpp b/tests/core/serialize/CustomQuery.cpp index 1c794ade..2fe643b4 100644 --- a/tests/core/serialize/CustomQuery.cpp +++ b/tests/core/serialize/CustomQuery.cpp @@ -63,7 +63,7 @@ int CustomQuery(int, char*[]) "(tab_bar.id > 17) GROUP BY tab_foo.double_n HAVING (AVG(tab_bar.id) > 19) ORDER BY tab_foo.double_n " "ASC,tab_foo.u_int_n DESC LIMIT 7 OFFSET 3"); - // A pragma query for sqlite + // A pragma query/query for sqlite compare(__LINE__, custom_query(sqlpp::verbatim("PRAGMA user_version")).with_result_type_of(select(sqlpp::value(1).as(pragma))), " PRAGMA user_version"); diff --git a/tests/core/static_asserts/aggregates.cpp b/tests/core/static_asserts/aggregates.cpp index bc4516cb..52a5a4e8 100644 --- a/tests/core/static_asserts/aggregates.cpp +++ b/tests/core/static_asserts/aggregates.cpp @@ -27,7 +27,7 @@ #include "Sample.h" #include #include -#include +#include #include #include diff --git a/tests/core/usage/CustomQuery.cpp b/tests/core/usage/CustomQuery.cpp index 4c8b352e..3f6199ef 100644 --- a/tests/core/usage/CustomQuery.cpp +++ b/tests/core/usage/CustomQuery.cpp @@ -27,7 +27,7 @@ #include "Sample.h" #include "MockDb.h" #include -#include +#include #include "../../include/test_helpers.h" namespace @@ -69,7 +69,7 @@ int CustomQuery(int, char*[]) const auto f = test::TabFoo{}; const auto t = test::TabBar{}; - // A void custom query + // A void custom query/query printer.reset(); auto x = //select(t.id).from(t).where(t.id > 7).group_by(t.id).having(max(t.id) > 13).order_by(t.textN.desc()); @@ -79,12 +79,12 @@ int CustomQuery(int, char*[]) #if 0 db(x); - // Syntactically, it is possible to use this void query as a prepared statement, too, not sure, whether this makes + // Syntactically, it is possible to use this void query/query as a prepared statement, too, not sure, whether this makes // sense very often... db(db.prepare(x)); // A prepared custom select - // The return type of the custom query is determined from the first argument which does have a return type, in this + // The return type of the custom query/query is determined from the first argument which does have a return type, in this // case the select auto p = db.prepare(custom_query(select(all_of(t)).from(t), where(t.id > sqlpp::parameter(t.id)))); p.params.id = 8; @@ -108,7 +108,7 @@ int CustomQuery(int, char*[]) on_duplicate_key_update(db, t.textN = "sample")(db, t.boolNn = false).get())); // A custom (select ... into) with adjusted return type - // The first argument with a return type is the select, but the custom query is really an insert. Thus, we tell it so. + // The first argument with a return type is the select, but the custom query/query is really an insert. Thus, we tell it so. printer.reset(); auto c = custom_query(select(all_of(t)).from(t), into(f)).with_result_type_of(insert_into(f)); std::cerr << serialize(c, printer).str() << std::endl; diff --git a/tests/core/usage/Function.cpp b/tests/core/usage/Function.cpp index a2ed0839..87b4fdba 100644 --- a/tests/core/usage/Function.cpp +++ b/tests/core/usage/Function.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/tests/core/usage/MockDb.h b/tests/core/usage/MockDb.h index 6c35294b..264bb210 100644 --- a/tests/core/usage/MockDb.h +++ b/tests/core/usage/MockDb.h @@ -26,12 +26,12 @@ */ #include -#include +#include #include -#include +#include #include #include -#include +#include #include // an object to store internal Mock flags and values to validate in tests diff --git a/tests/core/usage/Prepared.cpp b/tests/core/usage/Prepared.cpp index 3faddda1..881fdc53 100644 --- a/tests/core/usage/Prepared.cpp +++ b/tests/core/usage/Prepared.cpp @@ -130,7 +130,7 @@ int Prepared(int, char* []) std::cerr << x.id << std::endl; } - // Can we prepare a query without parameters? + // Can we prepare a query/query without parameters? { auto ps = db.prepare(select(all_of(t)).from(t).where((t.textN.like("%")))); for (const auto& row : db(ps)) diff --git a/tests/core/usage/Select.cpp b/tests/core/usage/Select.cpp index dfbf76ed..177cbe1f 100644 --- a/tests/core/usage/Select.cpp +++ b/tests/core/usage/Select.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include "../../include/test_helpers.h" diff --git a/tests/core/usage/SelectType.cpp b/tests/core/usage/SelectType.cpp index 3adf8262..ef6c919d 100644 --- a/tests/core/usage/SelectType.cpp +++ b/tests/core/usage/SelectType.cpp @@ -27,7 +27,7 @@ #include "Sample.h" #include #include -#include +#include #include #include #include "../../include/test_helpers.h" diff --git a/tests/core/usage/With.cpp b/tests/core/usage/With.cpp index 09239eba..e089ee43 100644 --- a/tests/core/usage/With.cpp +++ b/tests/core/usage/With.cpp @@ -62,13 +62,13 @@ int With(int, char*[]) const auto initialCte = ::sqlpp::cte(sqlpp::alias::a).as(selectBase); const auto recursiveCte = initialCte.union_all( select(t.id, t.intN).from(t.join(initialCte).on(t.id == initialCte.intN)).unconditionally()); - const auto query = with(recursiveCte)(select(recursiveCte.id).from(recursiveCte).unconditionally()); + const auto query/query = with(recursiveCte)(select(recursiveCte.id).from(recursiveCte).unconditionally()); printer.reset(); - const auto serializedQuery = serialize(query, printer).str(); + const auto serializedQuery = serialize(query/query, printer).str(); std::cout << serializedQuery << '\n'; - for (const auto& row : db(query)) + for (const auto& row : db(query/query)) { std::cout << row.id; } diff --git a/tests/mysql/serialize/compare.h b/tests/mysql/serialize/compare.h index 48e06f9a..2a59fd9a 100644 --- a/tests/mysql/serialize/compare.h +++ b/tests/mysql/serialize/compare.h @@ -25,7 +25,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include namespace diff --git a/tests/mysql/usage/Connection.cpp b/tests/mysql/usage/Connection.cpp index ee010591..02109a62 100644 --- a/tests/mysql/usage/Connection.cpp +++ b/tests/mysql/usage/Connection.cpp @@ -26,7 +26,7 @@ #include "../../include/ConnectionTests.h" #include "make_test_connection.h" -#include +#include #include int Connection(int, char*[]) diff --git a/tests/mysql/usage/CustomQuery.cpp b/tests/mysql/usage/CustomQuery.cpp index 1884e5c2..5b0d349c 100644 --- a/tests/mysql/usage/CustomQuery.cpp +++ b/tests/mysql/usage/CustomQuery.cpp @@ -27,7 +27,7 @@ #include "make_test_connection.h" #include "Tables.h" #include -#include +#include #include namespace diff --git a/tests/mysql/usage/DynamicSelect.cpp b/tests/mysql/usage/DynamicSelect.cpp index 9750463e..aea26cec 100644 --- a/tests/mysql/usage/DynamicSelect.cpp +++ b/tests/mysql/usage/DynamicSelect.cpp @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/tests/mysql/usage/Json.cpp b/tests/mysql/usage/Json.cpp index 88010b5b..b4543bc1 100644 --- a/tests/mysql/usage/Json.cpp +++ b/tests/mysql/usage/Json.cpp @@ -66,12 +66,12 @@ int Json(int, char*[]) const auto tab = test::TabJson{}; db(insert_into(tab).set(tab.data = R"--({"key" : "value"})--")); - const auto query = + const auto query/query = select(sqlpp::verbatim(R"--(JSON_UNQUOTE(JSON_EXTRACT(data, "$.key")))--").as(test::value)) .from(tab) .unconditionally(); - auto result = db(query); + auto result = db(query/query); if (result.empty()) throw std::runtime_error{"selection result is empty"}; diff --git a/tests/mysql/usage/MoveConstructor.cpp b/tests/mysql/usage/MoveConstructor.cpp index bc7ff895..da8b06d4 100644 --- a/tests/mysql/usage/MoveConstructor.cpp +++ b/tests/mysql/usage/MoveConstructor.cpp @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/tests/mysql/usage/Prepared.cpp b/tests/mysql/usage/Prepared.cpp index fb220f42..467fbb07 100644 --- a/tests/mysql/usage/Prepared.cpp +++ b/tests/mysql/usage/Prepared.cpp @@ -29,10 +29,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/tests/mysql/usage/Select.cpp b/tests/mysql/usage/Select.cpp index 8d5223e4..c767489f 100644 --- a/tests/mysql/usage/Select.cpp +++ b/tests/mysql/usage/Select.cpp @@ -29,10 +29,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include "../../include/test_helpers.h" diff --git a/tests/mysql/usage/Truncated.cpp b/tests/mysql/usage/Truncated.cpp index 16ceb84a..73b803a5 100644 --- a/tests/mysql/usage/Truncated.cpp +++ b/tests/mysql/usage/Truncated.cpp @@ -29,10 +29,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include "../../include/test_helpers.h" diff --git a/tests/mysql/usage/Union.cpp b/tests/mysql/usage/Union.cpp index 29777d13..994e0280 100644 --- a/tests/mysql/usage/Union.cpp +++ b/tests/mysql/usage/Union.cpp @@ -25,7 +25,7 @@ #include "make_test_connection.h" #include "Tables.h" -#include +#include #include #include "../../include/test_helpers.h" diff --git a/tests/postgresql/serialize/compare.h b/tests/postgresql/serialize/compare.h index 2958790c..ea0b9ec3 100644 --- a/tests/postgresql/serialize/compare.h +++ b/tests/postgresql/serialize/compare.h @@ -25,7 +25,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include diff --git a/tests/postgresql/usage/Basic.cpp b/tests/postgresql/usage/Basic.cpp index e3c8c93b..7a5ca348 100644 --- a/tests/postgresql/usage/Basic.cpp +++ b/tests/postgresql/usage/Basic.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include namespace sql = sqlpp::postgresql; diff --git a/tests/postgresql/usage/BasicConstConfig.cpp b/tests/postgresql/usage/BasicConstConfig.cpp index 600bab88..9ebf013e 100644 --- a/tests/postgresql/usage/BasicConstConfig.cpp +++ b/tests/postgresql/usage/BasicConstConfig.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include namespace sql = sqlpp::postgresql; diff --git a/tests/postgresql/usage/Connection.cpp b/tests/postgresql/usage/Connection.cpp index 29cf20e4..d38af98a 100644 --- a/tests/postgresql/usage/Connection.cpp +++ b/tests/postgresql/usage/Connection.cpp @@ -27,7 +27,7 @@ #include "../../include/ConnectionTests.h" #include "make_test_connection.h" -#include +#include #include int Connection(int, char*[]) diff --git a/tests/postgresql/usage/Date.cpp b/tests/postgresql/usage/Date.cpp index a445e28e..e115b592 100644 --- a/tests/postgresql/usage/Date.cpp +++ b/tests/postgresql/usage/Date.cpp @@ -27,7 +27,7 @@ #include -#include +#include #include #include diff --git a/tests/postgresql/usage/DateTime.cpp b/tests/postgresql/usage/DateTime.cpp index ca656bf0..ba3f7f23 100644 --- a/tests/postgresql/usage/DateTime.cpp +++ b/tests/postgresql/usage/DateTime.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/tests/postgresql/usage/Exceptions.cpp b/tests/postgresql/usage/Exceptions.cpp index bf3aeec9..027a0f74 100644 --- a/tests/postgresql/usage/Exceptions.cpp +++ b/tests/postgresql/usage/Exceptions.cpp @@ -23,8 +23,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include diff --git a/tests/postgresql/usage/Transaction.cpp b/tests/postgresql/usage/Transaction.cpp index 54673895..2a4d4e13 100644 --- a/tests/postgresql/usage/Transaction.cpp +++ b/tests/postgresql/usage/Transaction.cpp @@ -28,10 +28,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include "../../include/test_helpers.h" #include "make_test_connection.h" diff --git a/tests/postgresql/usage/Type.cpp b/tests/postgresql/usage/Type.cpp index 31f90fb6..440487ef 100644 --- a/tests/postgresql/usage/Type.cpp +++ b/tests/postgresql/usage/Type.cpp @@ -27,7 +27,7 @@ #include -#include +#include #include #include diff --git a/tests/sqlite3/serialize/compare.h b/tests/sqlite3/serialize/compare.h index 4084400b..20afcd37 100644 --- a/tests/sqlite3/serialize/compare.h +++ b/tests/sqlite3/serialize/compare.h @@ -25,7 +25,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include diff --git a/tests/sqlite3/usage/Attach.cpp b/tests/sqlite3/usage/Attach.cpp index 1134e121..127aaf8d 100644 --- a/tests/sqlite3/usage/Attach.cpp +++ b/tests/sqlite3/usage/Attach.cpp @@ -25,7 +25,7 @@ #include "Tables.h" #include -#include +#include #include #ifdef SQLPP_USE_SQLCIPHER diff --git a/tests/sqlite3/usage/AutoIncrement.cpp b/tests/sqlite3/usage/AutoIncrement.cpp index 74184b4c..1c343d7a 100644 --- a/tests/sqlite3/usage/AutoIncrement.cpp +++ b/tests/sqlite3/usage/AutoIncrement.cpp @@ -24,7 +24,7 @@ */ #include "Tables.h" -#include +#include #include #include diff --git a/tests/sqlite3/usage/Blob.cpp b/tests/sqlite3/usage/Blob.cpp index f578385b..86be5788 100644 --- a/tests/sqlite3/usage/Blob.cpp +++ b/tests/sqlite3/usage/Blob.cpp @@ -24,7 +24,7 @@ */ #include "Tables.h" -#include +#include #include #ifdef SQLPP_USE_SQLCIPHER @@ -94,7 +94,7 @@ int Blob(int, char*[]) std::vector data_smaller(blob_small_size); std::generate_n(data_smaller.begin(), blob_small_size, generator); - // If we use the bigger blob it will trigger SQLITE_TOOBIG for the query + // If we use the bigger blob it will trigger SQLITE_TOOBIG for the query/query auto id = db(insert_into(tab).set(tab.data = data_smaller)); auto prepared_insert = db.prepare(insert_into(tab).set(tab.data = parameter(tab.data))); diff --git a/tests/sqlite3/usage/Connection.cpp b/tests/sqlite3/usage/Connection.cpp index 4ec827ad..9e670ef0 100644 --- a/tests/sqlite3/usage/Connection.cpp +++ b/tests/sqlite3/usage/Connection.cpp @@ -25,7 +25,7 @@ #include "../../include/ConnectionTests.h" -#include +#include #include int Connection(int, char*[]) diff --git a/tests/sqlite3/usage/DateTime.cpp b/tests/sqlite3/usage/DateTime.cpp index dc457821..915a2c1a 100644 --- a/tests/sqlite3/usage/DateTime.cpp +++ b/tests/sqlite3/usage/DateTime.cpp @@ -24,7 +24,7 @@ */ #include "Tables.h" -#include +#include #include #include diff --git a/tests/sqlite3/usage/DynamicLoadingTest.cpp b/tests/sqlite3/usage/DynamicLoadingTest.cpp index 15c45ac2..54284782 100644 --- a/tests/sqlite3/usage/DynamicLoadingTest.cpp +++ b/tests/sqlite3/usage/DynamicLoadingTest.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #ifdef SQLPP_USE_SQLCIPHER diff --git a/tests/sqlite3/usage/DynamicSelect.cpp b/tests/sqlite3/usage/DynamicSelect.cpp index 16caa8a1..0b9e899c 100644 --- a/tests/sqlite3/usage/DynamicSelect.cpp +++ b/tests/sqlite3/usage/DynamicSelect.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #ifdef SQLPP_USE_SQLCIPHER diff --git a/tests/sqlite3/usage/Execute.cpp b/tests/sqlite3/usage/Execute.cpp index 7c3a11f9..05c0df6c 100644 --- a/tests/sqlite3/usage/Execute.cpp +++ b/tests/sqlite3/usage/Execute.cpp @@ -23,7 +23,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include diff --git a/tests/sqlite3/usage/FloatingPoint.cpp b/tests/sqlite3/usage/FloatingPoint.cpp index e3eff5f7..12380929 100644 --- a/tests/sqlite3/usage/FloatingPoint.cpp +++ b/tests/sqlite3/usage/FloatingPoint.cpp @@ -23,7 +23,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "Tables.h" diff --git a/tests/sqlite3/usage/Integral.cpp b/tests/sqlite3/usage/Integral.cpp index 03279263..f528ee21 100644 --- a/tests/sqlite3/usage/Integral.cpp +++ b/tests/sqlite3/usage/Integral.cpp @@ -23,7 +23,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "Tables.h" diff --git a/tests/sqlite3/usage/Sample.cpp b/tests/sqlite3/usage/Sample.cpp index 0701004e..bcba416d 100644 --- a/tests/sqlite3/usage/Sample.cpp +++ b/tests/sqlite3/usage/Sample.cpp @@ -24,7 +24,7 @@ */ #include "Tables.h" -#include +#include #include #include diff --git a/tests/sqlite3/usage/Select.cpp b/tests/sqlite3/usage/Select.cpp index 6daf1262..ea8a990d 100644 --- a/tests/sqlite3/usage/Select.cpp +++ b/tests/sqlite3/usage/Select.cpp @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/sqlite3/usage/Transaction.cpp b/tests/sqlite3/usage/Transaction.cpp index c444f80e..fb168654 100644 --- a/tests/sqlite3/usage/Transaction.cpp +++ b/tests/sqlite3/usage/Transaction.cpp @@ -25,13 +25,13 @@ #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #ifdef SQLPP_USE_SQLCIPHER diff --git a/tests/sqlite3/usage/Union.cpp b/tests/sqlite3/usage/Union.cpp index 51d389cc..2a55513f 100644 --- a/tests/sqlite3/usage/Union.cpp +++ b/tests/sqlite3/usage/Union.cpp @@ -24,7 +24,7 @@ */ #include "Tables.h" -#include +#include #include #ifdef SQLPP_USE_SQLCIPHER diff --git a/tests/sqlite3/usage/With.cpp b/tests/sqlite3/usage/With.cpp index 0b9a7b16..6d4525e1 100644 --- a/tests/sqlite3/usage/With.cpp +++ b/tests/sqlite3/usage/With.cpp @@ -25,7 +25,7 @@ #include "Tables.h" #include -#include +#include #include #ifdef SQLPP_USE_SQLCIPHER