More moves

include/sqlpp11/core/basic/parameter.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/core/operator/enable_comparison.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/detail/type_set.h>
 
 namespace sqlpp

include/sqlpp11/core/clause/cte.h

@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/result_row.h>
 #include <sqlpp11/core/clause/select_flags.h>
 #include <sqlpp11/core/query/statement_fwd.h>

include/sqlpp11/core/clause/insert.h

@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_insert.h>
 #include <sqlpp11/core/default_value.h>
 #include <sqlpp11/core/noop.h>

include/sqlpp11/core/clause/remove.h

@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_remove.h>
 #include <sqlpp11/core/noop.h>
 #include <sqlpp11/core/clause/from.h>

include/sqlpp11/core/clause/select_column_list.h

@@ -205,13 +205,13 @@ namespace sqlpp
       template <typename Db, typename Composite>
       auto _prepare(Db& db, const Composite& composite) const -> prepared_select_t<Db, _statement_t, Composite>
       {
-        return {make_parameter_list_t<Composite>{}, db.prepare_select(composite)};
+        return {{}, db.prepare_select(composite)};
       }
 
       template <typename Db>
       auto _prepare(Db& db) const -> prepared_select_t<Db, _statement_t>
       {
-        return {make_parameter_list_t<_statement_t>{}, db.prepare_select(_get_statement())};
+        return {{}, db.prepare_select(_get_statement())};
       }
     };
   };

include/sqlpp11/core/clause/union.h

@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/result_row.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>

include/sqlpp11/core/clause/update.h

@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_update.h>
 #include <sqlpp11/core/clause/single_table.h>
 #include <sqlpp11/core/clause/update_list.h>

include/sqlpp11/core/clause/where.h

@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>
 #include <sqlpp11/core/unconditional.h>

include/sqlpp11/core/clause/with.h

@@ -31,7 +31,6 @@
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
 #include <sqlpp11/core/no_data.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/policy_update.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>

include/sqlpp11/core/database/prepared_execute.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/database/prepared_insert.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/database/prepared_remove.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/database/prepared_select.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/database/prepared_update.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/detail/type_set.h

@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <sqlpp11/core/wrong.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/name_tag.h>
+#include <sqlpp11/core/name/name_tag.h>
 
 namespace sqlpp
 {

include/sqlpp11/core/eval.h

@@ -28,7 +28,7 @@
 
 #include <sqlpp11/core/type_traits.h>
 #include <sqlpp11/core/field_spec.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/basic/verbatim.h>
 
 namespace sqlpp

include/sqlpp11/core/function.h

@@ -29,7 +29,7 @@
 #include <sqlpp11/core/query/dynamic.h>
 #include <sqlpp11/core/noop.h>
 #include <sqlpp11/core/basic/parameter.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/aggregate_function.h>
 #include <sqlpp11/core/function/trim.h>
 #include <sqlpp11/core/operator/case.h>

include/sqlpp11/core/name/alias_provider.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 #include <sqlpp11/core/type_traits.h>
 
 #define SQLPP_ALIAS_PROVIDER(name)                                           \

include/sqlpp11/core/operator/case.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 #include <sqlpp11/core/detail/type_set.h>
 #include <sqlpp11/core/type_traits.h>
 

include/sqlpp11/core/query/statement.h

@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/core/noop.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/query/policy_update.h>
 #include <sqlpp11/core/database/prepared_select.h>
 #include <sqlpp11/core/result.h>

include/sqlpp11/core/type_traits.h

@@ -33,7 +33,7 @@
 #include <vector>
 
 #include <sqlpp11/core/chrono.h>
-#include <sqlpp11/core/name_tag.h>
+#include <sqlpp11/core/name/name_tag.h>
 #include <sqlpp11/core/compat/optional.h>
 #include <sqlpp11/core/compat/string_view.h>
 #include <sqlpp11/core/compat/type_traits.h>

include/sqlpp11/sqlite3/insert_or.h

@@ -30,7 +30,7 @@
 #include <sqlpp11/core/clause/insert_value_list.h>
 #include <sqlpp11/core/clause/into.h>
 #include <sqlpp11/core/noop.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/database/prepared_insert.h>
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/type_traits.h>

include/sqlpp11/sqlpp11.h

@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>
 #include <sqlpp11/core/clause/update.h>

tests/core/static_asserts/AssertTables.h

@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {

tests/core/static_asserts/aggregates.cpp

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

tests/core/usage/Function.cpp

@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/auto_alias.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/clause/select.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/database/connection.h>

tests/core/usage/Sample.h

@@ -5,7 +5,7 @@
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/core/basic/table_columns.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {

tests/core/usage/Select.cpp

@@ -28,7 +28,7 @@
 #include "is_regular.h"
 #include <algorithm>
 #include <iostream>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/select.h>

tests/core/usage/SelectType.cpp

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

tests/core/usage/Union.cpp

@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/core/clause/select.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <iostream>
 
 namespace greek

tests/core/usage/With.cpp

@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/core/clause/select.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <iostream>
 #include "../../include/test_helpers.h"
 

tests/include/TabDepartment.h

@@ -2,7 +2,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace model
 {

tests/mysql/usage/DynamicSelect.cpp

@@ -25,7 +25,7 @@
 
 #include "make_test_connection.h"
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>

tests/mysql/usage/MoveConstructor.cpp

@@ -25,7 +25,7 @@
 
 #include "make_test_connection.h"
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>

tests/mysql/usage/Prepared.cpp

@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>

tests/mysql/usage/Select.cpp

@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>

tests/mysql/usage/Tables.h

@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {

tests/mysql/usage/Truncated.cpp

@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>

tests/postgresql/usage/Exceptions.cpp

@@ -27,7 +27,7 @@
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/core/basic/verbatim.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 
 #include "assertThrow.h"
 

tests/postgresql/usage/Tables.h

@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {

tests/postgresql/usage/Transaction.cpp

@@ -27,7 +27,7 @@
 #include <memory>
 #include <stdexcept>
 
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/postgresql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>

tests/sqlite3/usage/DynamicLoadingTest.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "TabSample.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>

tests/sqlite3/usage/DynamicSelect.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>

tests/sqlite3/usage/Select.cpp

@@ -26,7 +26,7 @@
 
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>

tests/sqlite3/usage/Tables.h

@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {

tests/sqlite3/usage/Transaction.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>