Still more moves

include/sqlpp11/clause/cte.h

@@ -29,9 +29,9 @@
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/result_row.h>
+#include <sqlpp11/query/result_row.h>
 #include <sqlpp11/clause/select_flags.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/basic/table_ref.h>
 #include <sqlpp11/type_traits.h>
 

include/sqlpp11/clause/for_update.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/from.h

@@ -29,7 +29,7 @@
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
 #include <sqlpp11/no_data.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/basic/table_ref.h>
 #include <sqlpp11/type_traits.h>
 

include/sqlpp11/clause/group_by.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 #include <tuple>
 

include/sqlpp11/clause/having.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/basic/value.h>
 

include/sqlpp11/clause/insert.h

@@ -26,11 +26,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/prepared_insert.h>
+#include <sqlpp11/database/prepared_insert.h>
 #include <sqlpp11/default_value.h>
 #include <sqlpp11/noop.h>
 #include <sqlpp11/clause/into.h>

include/sqlpp11/clause/insert_value_list.h

@@ -32,10 +32,10 @@
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
 #include <sqlpp11/no_data.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/portable_static_assert.h>
 #include <sqlpp11/simple_column.h>
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/into.h

@@ -28,8 +28,8 @@
 
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/no_data.h>
-#include <sqlpp11/prepared_insert.h>
+#include <sqlpp11/database/prepared_insert.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/limit.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/offset.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/detail/type_set.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/order_by.h

@@ -29,7 +29,7 @@
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 #include <tuple>
 

include/sqlpp11/clause/remove.h

@@ -26,11 +26,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/prepared_remove.h>
+#include <sqlpp11/database/prepared_remove.h>
 #include <sqlpp11/noop.h>
 #include <sqlpp11/clause/from.h>
 #include <sqlpp11/clause/using.h>

include/sqlpp11/clause/select.h

@@ -26,10 +26,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 
 #include <sqlpp11/noop.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/clause/with.h>
 #include <sqlpp11/clause/select_flag_list.h>
 #include <sqlpp11/clause/select_column_list.h>

include/sqlpp11/clause/select_column_list.h

@@ -28,11 +28,11 @@
 
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/operator/as_expression.h>
-#include <sqlpp11/dynamic.h>
+#include <sqlpp11/query/dynamic.h>
 #include <sqlpp11/field_spec.h>
 #include <sqlpp11/interpret_tuple.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
-#include <sqlpp11/result_row.h>
+#include <sqlpp11/query/result_row.h>
 #include <sqlpp11/clause/select_as.h>
 #include <sqlpp11/clause/select_column_traits.h>
 #include <sqlpp11/basic/table.h>

include/sqlpp11/clause/select_column_traits.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/operator/as_expression.h>
-#include <sqlpp11/dynamic.h>
+#include <sqlpp11/query/dynamic.h>
 #include <sqlpp11/type_traits.h>
 
 // Select columns require a value type and a name.

include/sqlpp11/clause/select_flag_list.h

@@ -29,7 +29,7 @@
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/no_data.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/clause/select_flags.h>
 #include <sqlpp11/type_traits.h>
 #include <tuple>

include/sqlpp11/clause/union.h

@@ -29,8 +29,8 @@
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/result_row.h>
+#include <sqlpp11/query/result_row.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/clause/union_data.h>
 #include <sqlpp11/clause/union_flags.h>

include/sqlpp11/clause/update.h

@@ -26,11 +26,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/prepared_update.h>
+#include <sqlpp11/database/prepared_update.h>
 #include <sqlpp11/single_table.h>
 #include <sqlpp11/clause/update_list.h>
 #include <sqlpp11/noop.h>

include/sqlpp11/clause/using.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/interpret_tuple.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/clause/where.h

@@ -29,7 +29,7 @@
 #include <sqlpp11/interpret_tuple.h>
 #include <sqlpp11/logic.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/unconditional.h>
 #include <sqlpp11/basic/value.h>

include/sqlpp11/clause/with.h

@@ -32,8 +32,8 @@
 #include <sqlpp11/logic.h>
 #include <sqlpp11/no_data.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 
 #include <sqlpp11/clause/cte.h>

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 <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/circular_buffer.h>
 
 #include <memory>

include/sqlpp11/function.h

@@ -26,13 +26,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/dynamic.h>
+#include <sqlpp11/query/dynamic.h>
 #include <sqlpp11/noop.h>
 #include <sqlpp11/basic/parameter.h>
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/aggregate_function.h>
 #include <sqlpp11/function/trim.h>
-#include <sqlpp11/case.h>
+#include <sqlpp11/operator/case.h>
 #include <sqlpp11/function/lower.h>
 #include <sqlpp11/function/upper.h>
 #include <sqlpp11/value_type.h>

include/sqlpp11/mysql/bind_result.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/chrono.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/compat/optional.h>
 #include <sqlpp11/compat/string_view.h>
 #include <sqlpp11/compat/span.h>

include/sqlpp11/mysql/char_result.h

@@ -32,7 +32,7 @@
 #include <memory>
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/detail/parse_date_time.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/mysql/detail/result_handle.h>
 #include <sqlpp11/mysql/sqlpp_mysql.h>
 #include <sqlpp11/mysql/char_result_row.h>

include/sqlpp11/mysql/connection.h

@@ -27,9 +27,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/mysql/bind_result.h>
 #include <sqlpp11/mysql/char_result.h>
 #include <sqlpp11/mysql/connection_config.h>

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 <sqlpp11/connection_pool.h>
+#include <sqlpp11/database/connection_pool.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 
 namespace sqlpp
 {

include/sqlpp11/mysql/mysql.h

@@ -27,6 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
-#include <sqlpp11/mysql/connection_pool.h>
+#include <sqlpp11/mysql/database/connection_pool.h>
 #include <sqlpp11/mysql/char_result.h>

include/sqlpp11/no_data.h

@@ -28,6 +28,7 @@
 
 namespace sqlpp
 {
+#warning: Is this still needed?
   struct no_data_t
   {
   };

include/sqlpp11/noop.h

@@ -27,7 +27,7 @@
  */
 
 #include <type_traits>
-#include <sqlpp11/prepared_execute.h>
+#include <sqlpp11/database/prepared_execute.h>
 
 namespace sqlpp
 {

include/sqlpp11/operator/any.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/operator/logical_expression.h

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <type_traits>
 
 #include <sqlpp11/enable_as.h>
-#include <sqlpp11/dynamic.h>
+#include <sqlpp11/query/dynamic.h>
 #include <sqlpp11/noop.h>
 //#include <sqlpp11/embrace.h>
 //#include <sqlpp11/to_sql_string.h>

include/sqlpp11/postgresql/connection.h

@@ -33,17 +33,17 @@
 #include <sstream>
 
 #include <sqlpp11/compat/make_unique.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
 #include <sqlpp11/postgresql/bind_result.h>
 #include <sqlpp11/postgresql/connection_config.h>
 #include <sqlpp11/postgresql/prepared_statement.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 #include <sqlpp11/postgresql/result.h>
 #include <sqlpp11/postgresql/detail/connection_handle.h>
 #include <sqlpp11/postgresql/detail/prepared_statement_handle.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 
 #ifdef SQLPP_DYNAMIC_LOADING
 #include <sqlpp11/postgresql/dynamic_libpq.h>

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 <sqlpp11/connection_pool.h>
+#include <sqlpp11/database/connection_pool.h>
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
 
 namespace sqlpp
 {

include/sqlpp11/postgresql/exception.h

@@ -32,7 +32,7 @@
 */
 
 #include "visibility.h"
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <string>
 
 namespace sqlpp

include/sqlpp11/postgresql/on_conflict.h

@@ -29,7 +29,7 @@
 
 #include <sqlpp11/postgresql/on_conflict_do_nothing.h>
 #include <sqlpp11/postgresql/on_conflict_do_clause/update.h>
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 
 namespace sqlpp
 {

include/sqlpp11/postgresql/postgresql.h

@@ -28,9 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
-#include <sqlpp11/postgresql/connection_pool.h>
+#include <sqlpp11/postgresql/database/connection_pool.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 #include <sqlpp11/postgresql/clause/insert.h>
 #include <sqlpp11/postgresql/clause/remove.h>
 #include <sqlpp11/postgresql/clause/update.h>

include/sqlpp11/postgresql/prepared_statement.h

@@ -32,7 +32,7 @@
 #include <string>
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 
 namespace sqlpp
 {

include/sqlpp11/postgresql/result.h

@@ -36,7 +36,7 @@
 #include <libpq-fe.h>
 
 #include <sqlpp11/postgresql/visibility.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 
 #ifdef SQLPP_DYNAMIC_LOADING
 #include <sqlpp11/postgresql/dynamic_libpq.h>

include/sqlpp11/postgresql/returning.h

@@ -29,7 +29,7 @@
 
 #include <sqlpp11/postgresql/returning_column_list.h>
 #include <sqlpp11/clause/select_column_list.h>
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 
 namespace sqlpp
 {

include/sqlpp11/postgresql/returning_column_list.h

@@ -33,8 +33,8 @@
 #include <sqlpp11/expression_fwd.h>
 #include <sqlpp11/field_spec.h>
 #include <sqlpp11/interpret_tuple.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
-#include <sqlpp11/result_row.h>
+#include <sqlpp11/query/result_row.h>
 #include <sqlpp11/select_pseudo_table.h>
 #include <sqlpp11/basic/table.h>
 #include <tuple>

include/sqlpp11/query/custom_query.h

@@ -26,11 +26,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/get_first.h>
 #include <sqlpp11/hidden.h>
 #include <sqlpp11/interpret_tuple.h>
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 
 namespace sqlpp
 {

include/sqlpp11/query/result_row.h

@@ -30,7 +30,7 @@
 #include <sqlpp11/compat/string_view.h>
 #include <sqlpp11/detail/index_sequence.h>
 #include <sqlpp11/field_spec.h>
-#include <sqlpp11/result_row_fwd.h>
+#include <sqlpp11/query/result_row_fwd.h>
 
 namespace sqlpp
 {

include/sqlpp11/query/statement.h

@@ -28,11 +28,11 @@
 
 #include <sqlpp11/noop.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/policy_update.h>
+#include <sqlpp11/query/policy_update.h>
-#include <sqlpp11/prepared_select.h>
+#include <sqlpp11/database/prepared_select.h>
 #include <sqlpp11/result.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/statement_fwd.h>
+#include <sqlpp11/query/statement_fwd.h>
 
 #include <sqlpp11/detail/get_first.h>
 #include <sqlpp11/detail/get_last.h>

include/sqlpp11/single_table.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/no_data.h>
-#include <sqlpp11/prepared_insert.h>
+#include <sqlpp11/database/prepared_insert.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/sqlite3/bind_result.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/detail/parse_date_time.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/sqlite3/detail/prepared_statement_handle.h>
 #include <sqlpp11/sqlite3/export.h>
 #include <sqlpp11/compat/optional.h>

include/sqlpp11/sqlite3/connection.h

@@ -32,9 +32,9 @@
 #else
 #include <sqlite3.h>
 #endif
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/basic/schema.h>
 #include <sqlpp11/serialize.h>
 #include <sqlpp11/sqlite3/bind_result.h>
@@ -42,7 +42,7 @@
 #include <sqlpp11/sqlite3/detail/connection_handle.h>
 #include <sqlpp11/sqlite3/prepared_statement.h>
 #include <sqlpp11/sqlite3/export.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/type_traits.h>
 #include <sstream>
 #include <string>

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 <sqlpp11/connection_pool.h>
+#include <sqlpp11/database/connection_pool.h>
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
 
 namespace sqlpp
 {

include/sqlpp11/sqlite3/insert_or.h

@@ -31,8 +31,8 @@
 #include <sqlpp11/clause/into.h>
 #include <sqlpp11/noop.h>
 #include <sqlpp11/parameter_list.h>
-#include <sqlpp11/prepared_insert.h>
+#include <sqlpp11/database/prepared_insert.h>
-#include <sqlpp11/statement.h>
+#include <sqlpp11/query/statement.h>
 #include <sqlpp11/type_traits.h>
 
 namespace sqlpp

include/sqlpp11/sqlite3/prepared_statement.h

@@ -34,7 +34,7 @@
 #include <date/date.h>
 
 #include <sqlpp11/chrono.h>
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
 #include <sqlpp11/sqlite3/export.h>
 
 #include <sqlpp11/sqlite3/detail/prepared_statement_handle.h>

include/sqlpp11/sqlite3/sqlite3.h

@@ -27,6 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
-#include <sqlpp11/sqlite3/connection_pool.h>
+#include <sqlpp11/sqlite3/database/connection_pool.h>
 #include <sqlpp11/sqlite3/insert_or.h>

include/sqlpp11/sqlpp11.h

@@ -33,6 +33,6 @@
 #include <sqlpp11/clause/select.h>
 #include <sqlpp11/function.h>
 #include <sqlpp11/operator.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/basic/schema_qualified_table.h>
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/custom_query.h>

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");

tests/core/static_asserts/aggregates.cpp

@@ -27,7 +27,7 @@
 #include "Sample.h"
 #include <iostream>
 #include <sqlpp11/alias_provider.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/select.h>
 

tests/core/usage/CustomQuery.cpp

@@ -27,7 +27,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/sqlpp11.h>
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #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;

tests/core/usage/Function.cpp

@@ -29,7 +29,7 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/clause/select.h>
 #include <sqlpp11/functions.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 
 #include <iostream>
 

tests/core/usage/MockDb.h

@@ -26,12 +26,12 @@
  */
 
 #include <iostream>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/basic/schema.h>
 #include <sqlpp11/serialize.h>
-#include <sqlpp11/serializer_context.h>
+#include <sqlpp11/database/serializer_context.h>
 #include <sstream>
 
 // an object to store internal Mock flags and values to validate in tests

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))

tests/core/usage/Select.cpp

@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <iostream>
 #include <sqlpp11/alias_provider.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/select.h>
 #include "../../include/test_helpers.h"

tests/core/usage/SelectType.cpp

@@ -27,7 +27,7 @@
 #include "Sample.h"
 #include <iostream>
 #include <sqlpp11/alias_provider.h>
-#include <sqlpp11/connection.h>
+#include <sqlpp11/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/select.h>
 #include "../../include/test_helpers.h"

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;
     }

tests/mysql/serialize/compare.h

@@ -25,7 +25,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <iostream>
 
 namespace

tests/mysql/usage/Connection.cpp

@@ -26,7 +26,7 @@
 #include "../../include/ConnectionTests.h"
 #include "make_test_connection.h"
 
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 
 int Connection(int, char*[])

tests/mysql/usage/CustomQuery.cpp

@@ -27,7 +27,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <sqlpp11/sqlpp11.h>
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/mysql/mysql.h>
 
 namespace

tests/mysql/usage/DynamicSelect.cpp

@@ -28,10 +28,10 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/insert.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/clause/remove.h>
 #include <sqlpp11/clause/select.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/clause/update.h>
 
 #include <iostream>

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<sqlpp::text>(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"};
 

tests/mysql/usage/MoveConstructor.cpp

@@ -28,10 +28,10 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/insert.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/clause/remove.h>
 #include <sqlpp11/clause/select.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/clause/update.h>
 
 #include <cassert>

tests/mysql/usage/Prepared.cpp

@@ -29,10 +29,10 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/insert.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/clause/remove.h>
 #include <sqlpp11/clause/select.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/clause/update.h>
 
 #include <iostream>

tests/mysql/usage/Select.cpp

@@ -29,10 +29,10 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/insert.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/clause/remove.h>
 #include <sqlpp11/clause/select.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/clause/update.h>
 #include "../../include/test_helpers.h"
 

tests/mysql/usage/Truncated.cpp

@@ -29,10 +29,10 @@
 #include <sqlpp11/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/clause/insert.h>
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/clause/remove.h>
 #include <sqlpp11/clause/select.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include <sqlpp11/clause/update.h>
 #include "../../include/test_helpers.h"
 

tests/mysql/usage/Union.cpp

@@ -25,7 +25,7 @@
 
 #include "make_test_connection.h"
 #include "Tables.h"
-#include <sqlpp11/mysql/connection.h>
+#include <sqlpp11/mysql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 #include "../../include/test_helpers.h"
 

tests/postgresql/serialize/compare.h

@@ -25,7 +25,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
 
 #include <iostream>
 

tests/postgresql/usage/Basic.cpp

@@ -27,8 +27,8 @@
 #include <memory>
 #include <stdexcept>
 
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 #include <sqlpp11/sqlpp11.h>
 
 namespace sql = sqlpp::postgresql;

tests/postgresql/usage/BasicConstConfig.cpp

@@ -27,8 +27,8 @@
 #include <memory>
 #include <stdexcept>
 
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 #include <sqlpp11/sqlpp11.h>
 
 namespace sql = sqlpp::postgresql;

tests/postgresql/usage/Connection.cpp

@@ -27,7 +27,7 @@
 #include "../../include/ConnectionTests.h"
 #include "make_test_connection.h"
 
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 
 int Connection(int, char*[])

tests/postgresql/usage/Date.cpp

@@ -27,7 +27,7 @@
 
 #include <iostream>
 
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/sqlpp11.h>
 

tests/postgresql/usage/DateTime.cpp

@@ -27,7 +27,7 @@
 #include <iostream>
 #include <vector>
 
-#include <sqlpp11/postgresql/exception.h>
+#include <sqlpp11/postgresql/database/exception.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/sqlpp11.h>
 

tests/postgresql/usage/Exceptions.cpp

@@ -23,8 +23,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/exception.h>
+#include <sqlpp11/database/exception.h>
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/basic/verbatim.h>
 #include <sqlpp11/alias_provider.h>

tests/postgresql/usage/Transaction.cpp

@@ -28,10 +28,10 @@
 #include <stdexcept>
 
 #include <sqlpp11/alias_provider.h>
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
-#include <sqlpp11/postgresql/connection.h>
+#include <sqlpp11/postgresql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
-#include <sqlpp11/transaction.h>
+#include <sqlpp11/database/transaction.h>
 #include "../../include/test_helpers.h"
 
 #include "make_test_connection.h"

tests/postgresql/usage/Type.cpp

@@ -27,7 +27,7 @@
 
 #include <iostream>
 
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/sqlpp11.h>
 

tests/sqlite3/serialize/compare.h

@@ -25,7 +25,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
 
 #include <iostream>
 

tests/sqlite3/usage/Attach.cpp

@@ -25,7 +25,7 @@
 
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 
 #ifdef SQLPP_USE_SQLCIPHER

tests/sqlite3/usage/AutoIncrement.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "Tables.h"
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/sqlite3/sqlite3.h>
 #include <sqlpp11/sqlpp11.h>
 

tests/sqlite3/usage/Blob.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "Tables.h"
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 
 #ifdef SQLPP_USE_SQLCIPHER
@@ -94,7 +94,7 @@ int Blob(int, char*[])
   std::vector<uint8_t> 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)));

tests/sqlite3/usage/Connection.cpp

@@ -25,7 +25,7 @@
 
 #include "../../include/ConnectionTests.h"
 
-#include <sqlpp11/sqlite3/connection.h>
+#include <sqlpp11/sqlite3/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
 
 int Connection(int, char*[])

tests/sqlite3/usage/DateTime.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "Tables.h"
-#include <sqlpp11/custom_query.h>
+#include <sqlpp11/query/query/custom_query.h>
 #include <sqlpp11/sqlite3/sqlite3.h>
 #include <sqlpp11/sqlpp11.h>