More moves

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>
 

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>

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
 {

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
 {

include/sqlpp11/expression_operators.h

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

include/sqlpp11/expression_return_types.h

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

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/basic/verbatim.h>  // Csaba Csoma suggests: unsafe_sql instead of verbatim
-#include <sqlpp11/parameterized_verbatim.h>
+#include <sqlpp11/basic/parameterized_verbatim.h>
-#include <sqlpp11/verbatim_table.h>
+#include <sqlpp11/basic/verbatim_table.h>
 #include <sqlpp11/basic/value.h>
 #include <sqlpp11/eval.h>
 

include/sqlpp11/postgresql/serializer.h

@@ -28,7 +28,7 @@
  */
 
 #include <sqlpp11/chrono.h>
-#include <sqlpp11/parameter.h>
+#include <sqlpp11/basic/parameter.h>
 
 namespace sqlpp
 {

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>

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>

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>

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>

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"