From 715839e18fba6ed77c5855f59c6d48ceca350201 Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Sun, 28 Jul 2024 21:02:11 +0200
Subject: [PATCH] More moves

---
 include/sqlpp11/{ => basic}/all_of.h          |   0
 include/sqlpp11/{ => basic}/parameter.h       |   0
 .../{ => basic}/parameterized_verbatim.h      |   0
 include/sqlpp11/{ => basic}/schema.h          |   0
 .../{ => basic}/schema_qualified_table.h      |   2 +-
 include/sqlpp11/basic/table.h                 |   2 +-
 include/sqlpp11/{ => basic}/verbatim.h        |   0
 include/sqlpp11/{ => basic}/verbatim_table.h  |   0
 include/sqlpp11/clause/with.h                 |   2 +-
 include/sqlpp11/eval.h                        |   2 +-
 include/sqlpp11/expression_operators.h        |  38 -----
 include/sqlpp11/expression_return_types.h     | 158 ------------------
 include/sqlpp11/function.h                    |   8 +-
 include/sqlpp11/postgresql/serializer.h       |   2 +-
 include/sqlpp11/sqlite3/connection.h          |   2 +-
 include/sqlpp11/sqlite3/serializer.h          |   2 +-
 include/sqlpp11/sqlpp11.h                     |   2 +-
 tests/core/usage/MockDb.h                     |   2 +-
 tests/postgresql/usage/Exceptions.cpp         |   2 +-
 19 files changed, 14 insertions(+), 210 deletions(-)
 rename include/sqlpp11/{ => basic}/all_of.h (100%)
 rename include/sqlpp11/{ => basic}/parameter.h (100%)
 rename include/sqlpp11/{ => basic}/parameterized_verbatim.h (100%)
 rename include/sqlpp11/{ => basic}/schema.h (100%)
 rename include/sqlpp11/{ => basic}/schema_qualified_table.h (98%)
 rename include/sqlpp11/{ => basic}/verbatim.h (100%)
 rename include/sqlpp11/{ => basic}/verbatim_table.h (100%)
 delete mode 100644 include/sqlpp11/expression_operators.h
 delete mode 100644 include/sqlpp11/expression_return_types.h

diff --git a/include/sqlpp11/all_of.h b/include/sqlpp11/basic/all_of.h
similarity index 100%
rename from include/sqlpp11/all_of.h
rename to include/sqlpp11/basic/all_of.h
diff --git a/include/sqlpp11/parameter.h b/include/sqlpp11/basic/parameter.h
similarity index 100%
rename from include/sqlpp11/parameter.h
rename to include/sqlpp11/basic/parameter.h
diff --git a/include/sqlpp11/parameterized_verbatim.h b/include/sqlpp11/basic/parameterized_verbatim.h
similarity index 100%
rename from include/sqlpp11/parameterized_verbatim.h
rename to include/sqlpp11/basic/parameterized_verbatim.h
diff --git a/include/sqlpp11/schema.h b/include/sqlpp11/basic/schema.h
similarity index 100%
rename from include/sqlpp11/schema.h
rename to include/sqlpp11/basic/schema.h
diff --git a/include/sqlpp11/schema_qualified_table.h b/include/sqlpp11/basic/schema_qualified_table.h
similarity index 98%
rename from include/sqlpp11/schema_qualified_table.h
rename to include/sqlpp11/basic/schema_qualified_table.h
index 3f7d08dd..fa72ccce 100644
--- a/include/sqlpp11/schema_qualified_table.h
+++ b/include/sqlpp11/basic/schema_qualified_table.h
@@ -29,7 +29,7 @@
 #include <sqlpp11/basic/column_fwd.h>
 #include <sqlpp11/serialize.h>
 #include <sqlpp11/type_traits.h>
-#include <sqlpp11/schema.h>
+#include <sqlpp11/basic/schema.h>
 #include <sqlpp11/basic/table_alias.h>
 #include <sqlpp11/detail/type_set.h>
 
diff --git a/include/sqlpp11/basic/table.h b/include/sqlpp11/basic/table.h
index b2fadee4..eed0ac1f 100644
--- a/include/sqlpp11/basic/table.h
+++ b/include/sqlpp11/basic/table.h
@@ -29,7 +29,7 @@
 #include <sqlpp11/enable_join.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/basic/table_alias.h>
-#include <sqlpp11/all_of.h>
+#include <sqlpp11/basic/all_of.h>
 #include <sqlpp11/basic/column.h>
 #include <sqlpp11/detail/type_set.h>
 #include <sqlpp11/basic/join.h>
diff --git a/include/sqlpp11/verbatim.h b/include/sqlpp11/basic/verbatim.h
similarity index 100%
rename from include/sqlpp11/verbatim.h
rename to include/sqlpp11/basic/verbatim.h
diff --git a/include/sqlpp11/verbatim_table.h b/include/sqlpp11/basic/verbatim_table.h
similarity index 100%
rename from include/sqlpp11/verbatim_table.h
rename to include/sqlpp11/basic/verbatim_table.h
diff --git a/include/sqlpp11/clause/with.h b/include/sqlpp11/clause/with.h
index c87c80d5..7c9474ae 100644
--- a/include/sqlpp11/clause/with.h
+++ b/include/sqlpp11/clause/with.h
@@ -36,7 +36,7 @@
 #include <sqlpp11/statement_fwd.h>
 #include <sqlpp11/type_traits.h>
 
-#include <sqlpp11/cte.h>
+#include <sqlpp11/clause/cte.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/eval.h b/include/sqlpp11/eval.h
index ab7a046f..0d18bd86 100644
--- a/include/sqlpp11/eval.h
+++ b/include/sqlpp11/eval.h
@@ -29,7 +29,7 @@
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/field_spec.h>
 #include <sqlpp11/alias_provider.h>
-#include <sqlpp11/verbatim.h>
+#include <sqlpp11/basic/verbatim.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/expression_operators.h b/include/sqlpp11/expression_operators.h
deleted file mode 100644
index a524b480..00000000
--- a/include/sqlpp11/expression_operators.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) 2013-2015, Roland Bock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sqlpp11/wrong.h>
-
-namespace sqlpp
-{
-  template <typename Expr, typename ValueType>
-  struct expression_operators
-  {
-    static_assert(wrong_t<expression_operators>::value, "Missing expression operators for ValueType");
-  };
-}  // namespace sqlpp
diff --git a/include/sqlpp11/expression_return_types.h b/include/sqlpp11/expression_return_types.h
deleted file mode 100644
index c095cd52..00000000
--- a/include/sqlpp11/expression_return_types.h
+++ /dev/null
@@ -1,158 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) 2013-2015, Roland Bock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sqlpp11/bad_expression.h>
-
-namespace sqlpp
-{
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_and
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_and_t = typename return_type_and<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_bitwise_and
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_bitwise_and_t = typename return_type_bitwise_and<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_shift_left
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_shift_left_t = typename return_type_shift_left<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_shift_right
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_shift_right_t = typename return_type_shift_right<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_or
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_or_t = typename return_type_or<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_bitwise_or
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename L, typename R>
-  using return_type_bitwise_or_t = typename return_type_bitwise_or<L, R>::type;
-
-  template <typename T, typename Defer, typename Enable = void>
-  struct return_type_not
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<boolean>;
-  };
-  template <typename T, typename Defer>
-  using return_type_not_t = typename return_type_not<T, Defer>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_plus
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<L>>;
-  };
-  template <typename L, typename R>
-  using return_type_plus_t = typename return_type_plus<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_minus
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<L>>;
-  };
-  template <typename L, typename R>
-  using return_type_minus_t = typename return_type_minus<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_multiplies
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<L>>;
-  };
-  template <typename L, typename R>
-  using return_type_multiplies_t = typename return_type_multiplies<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_divides
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<L>>;
-  };
-  template <typename L, typename R>
-  using return_type_divides_t = typename return_type_divides<L, R>::type;
-
-  template <typename L, typename R, typename Enable = void>
-  struct return_type_modulus
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<L>>;
-  };
-  template <typename L, typename R>
-  using return_type_modulus_t = typename return_type_modulus<L, R>::type;
-
-  template <typename T, typename Defer, typename Enable = void>
-  struct return_type_unary_plus
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<T>>;
-  };
-  template <typename T, typename Defer>
-  using return_type_unary_plus_t = typename return_type_unary_plus<T, Defer>::type;
-
-  template <typename T, typename Defer, typename Enable = void>
-  struct return_type_unary_minus
-  {
-    using check = assert_valid_operands;
-    using type = bad_expression<value_type_of_t<T>>;
-  };
-  template <typename T, typename Defer>
-  using return_type_unary_minus_t = typename return_type_unary_minus<T, Defer>::type;
-}  // namespace sqlpp
diff --git a/include/sqlpp11/function.h b/include/sqlpp11/function.h
index 4459910e..3b71950d 100644
--- a/include/sqlpp11/function.h
+++ b/include/sqlpp11/function.h
@@ -28,7 +28,7 @@
 
 #include <sqlpp11/dynamic.h>
 #include <sqlpp11/noop.h>
-#include <sqlpp11/parameter.h>
+#include <sqlpp11/basic/parameter.h>
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/aggregate_function.h>
 #include <sqlpp11/function/trim.h>
@@ -36,9 +36,9 @@
 #include <sqlpp11/function/lower.h>
 #include <sqlpp11/function/upper.h>
 #include <sqlpp11/value_type.h>
-#include <sqlpp11/verbatim.h>  // Csaba Csoma suggests: unsafe_sql instead of verbatim
-#include <sqlpp11/parameterized_verbatim.h>
-#include <sqlpp11/verbatim_table.h>
+#include <sqlpp11/basic/verbatim.h>  // Csaba Csoma suggests: unsafe_sql instead of verbatim
+#include <sqlpp11/basic/parameterized_verbatim.h>
+#include <sqlpp11/basic/verbatim_table.h>
 #include <sqlpp11/basic/value.h>
 #include <sqlpp11/eval.h>
 
diff --git a/include/sqlpp11/postgresql/serializer.h b/include/sqlpp11/postgresql/serializer.h
index 1c3ad837..d7ab4988 100644
--- a/include/sqlpp11/postgresql/serializer.h
+++ b/include/sqlpp11/postgresql/serializer.h
@@ -28,7 +28,7 @@
  */
 
 #include <sqlpp11/chrono.h>
-#include <sqlpp11/parameter.h>
+#include <sqlpp11/basic/parameter.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/sqlite3/connection.h b/include/sqlpp11/sqlite3/connection.h
index 79544910..842b3f5c 100644
--- a/include/sqlpp11/sqlite3/connection.h
+++ b/include/sqlpp11/sqlite3/connection.h
@@ -35,7 +35,7 @@
 #include <sqlpp11/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
 #include <sqlpp11/exception.h>
-#include <sqlpp11/schema.h>
+#include <sqlpp11/basic/schema.h>
 #include <sqlpp11/serialize.h>
 #include <sqlpp11/sqlite3/bind_result.h>
 #include <sqlpp11/sqlite3/connection_config.h>
diff --git a/include/sqlpp11/sqlite3/serializer.h b/include/sqlpp11/sqlite3/serializer.h
index 323bea62..1bcc15d4 100644
--- a/include/sqlpp11/sqlite3/serializer.h
+++ b/include/sqlpp11/sqlite3/serializer.h
@@ -37,7 +37,7 @@
 #include <sqlpp11/data_types/integral/operand.h>
 #include <sqlpp11/data_types/time_point/operand.h>
 #include <sqlpp11/data_types/unsigned_integral/operand.h>
-#include <sqlpp11/parameter.h>
+#include <sqlpp11/basic/parameter.h>
 #include <sqlpp11/basic/pre_join.h>
 #include <sqlpp11/some.h>
 #include <sqlpp11/clause/with.h>
diff --git a/include/sqlpp11/sqlpp11.h b/include/sqlpp11/sqlpp11.h
index 31b54f17..d8496f41 100644
--- a/include/sqlpp11/sqlpp11.h
+++ b/include/sqlpp11/sqlpp11.h
@@ -34,5 +34,5 @@
 #include <sqlpp11/function.h>
 #include <sqlpp11/operator.h>
 #include <sqlpp11/transaction.h>
-#include <sqlpp11/schema_qualified_table.h>
+#include <sqlpp11/basic/schema_qualified_table.h>
 #include <sqlpp11/custom_query.h>
diff --git a/tests/core/usage/MockDb.h b/tests/core/usage/MockDb.h
index 6d6679b0..6c35294b 100644
--- a/tests/core/usage/MockDb.h
+++ b/tests/core/usage/MockDb.h
@@ -29,7 +29,7 @@
 #include <sqlpp11/connection.h>
 #include <sqlpp11/detail/float_safe_ostringstream.h>
 #include <sqlpp11/transaction.h>
-#include <sqlpp11/schema.h>
+#include <sqlpp11/basic/schema.h>
 #include <sqlpp11/serialize.h>
 #include <sqlpp11/serializer_context.h>
 #include <sstream>
diff --git a/tests/postgresql/usage/Exceptions.cpp b/tests/postgresql/usage/Exceptions.cpp
index 58d89325..bf3aeec9 100644
--- a/tests/postgresql/usage/Exceptions.cpp
+++ b/tests/postgresql/usage/Exceptions.cpp
@@ -26,7 +26,7 @@
 #include <sqlpp11/exception.h>
 #include <sqlpp11/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
-#include <sqlpp11/verbatim.h>
+#include <sqlpp11/basic/verbatim.h>
 #include <sqlpp11/alias_provider.h>
 
 #include "assertThrow.h"