Introduced a configuration header, made universally available

aquarist-labs · Feb 15, 2023 · f30c993 · f30c993
1 parent 99c3404
commit f30c993
Show file tree

Hide file tree

Showing 20 changed files with 1,366 additions and 1,324 deletions.
diff --git a/dev/alias.h b/dev/alias.h
@@ -15,7 +15,7 @@ namespace sqlite_orm {
 
     namespace internal {
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         /*
          *  Helper class to facilitate user-defined string literal operator template
          */
@@ -126,7 +126,7 @@ namespace sqlite_orm {
             alias_holder() = default;
         };
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         template<char A, char... C>
         struct table_alias_builder {
             static_assert(sizeof...(C) == 0 && ((A >= 'A' && 'Z' <= A) || (A >= 'a' && 'z' <= A)),
@@ -158,7 +158,7 @@ namespace sqlite_orm {
         return {c};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als,
              class C,
              class A = std::remove_const_t<decltype(als)>,
@@ -184,7 +184,7 @@ namespace sqlite_orm {
         return {std::move(expression)};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, class E, internal::satisfies<internal::is_column_alias, decltype(als)> = true>
     auto as(E expression) {
         return internal::as_t<std::remove_const_t<decltype(als)>, E>{std::move(expression)};
@@ -204,7 +204,7 @@ namespace sqlite_orm {
         return {};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, internal::satisfies<internal::is_column_alias, decltype(als)> = true>
     auto get() {
         return internal::alias_holder<std::remove_const_t<decltype(als)>>{};
@@ -274,7 +274,7 @@ namespace sqlite_orm {
     using colalias_h = internal::column_alias<'h'>;
     using colalias_i = internal::column_alias<'i'>;
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     /** @short Create aliased tables e.g. `constexpr auto z_alias = alias_<'z'>.for_<User>()`.
      */
     template<char A>

diff --git a/dev/column_result.h b/dev/column_result.h
@@ -10,6 +10,7 @@
 #include "tuple_helper/tuple_filter.h"
 #include "type_traits.h"
 #include "member_traits/member_traits.h"
+#include "mapped_type_proxy.h"
 #include "core_functions.h"
 #include "select_constraints.h"
 #include "operators.h"

diff --git a/dev/conditions.h b/dev/conditions.h
@@ -819,7 +819,7 @@ namespace sqlite_orm {
         return {};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     /**
      *  Explicit FROM function. Usage:
      *  `storage.select(&User::id, from<"a"_alias.for_<User>>());`
@@ -1028,7 +1028,7 @@ namespace sqlite_orm {
         return {std::move(o)};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, class O, internal::satisfies<internal::is_recordset_alias, decltype(als)> = true>
     auto left_join(O o) {
         return internal::left_join_t<std::remove_const_t<decltype(als)>, O>{std::move(o)};
@@ -1040,7 +1040,7 @@ namespace sqlite_orm {
         return {std::move(o)};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, class O, internal::satisfies<internal::is_recordset_alias, decltype(als)> = true>
     auto join(O o) {
         return internal::join_t<std::remove_const_t<decltype(als)>, O>{std::move(o)};
@@ -1052,7 +1052,7 @@ namespace sqlite_orm {
         return {std::move(o)};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, class O, internal::satisfies<internal::is_recordset_alias, decltype(als)> = true>
     auto left_outer_join(O o) {
         return internal::left_outer_join_t<std::remove_const_t<decltype(als)>, O>{std::move(o)};
@@ -1064,7 +1064,7 @@ namespace sqlite_orm {
         return {std::move(o)};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, class O, internal::satisfies<internal::is_recordset_alias, decltype(als)> = true>
     auto inner_join(O o) {
         return internal::inner_join_t<std::remove_const_t<decltype(als)>, O>{std::move(o)};

diff --git a/dev/functional/config.h b/dev/functional/config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "cxx_universal.h"
+
+#if defined(SQLITE_ORM_CONCEPTS_SUPPORTED) && defined(SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED) &&                 \
+    defined(SQLITE_ORM_INLINE_VARIABLES_SUPPORTED)
+#define SQLITE_ORM_WITH_CPP20_ALIASES
+#endif
diff --git a/dev/functional/cxx_compiler_quirks.h b/dev/functional/cxx_compiler_quirks.h
@@ -1,5 +1,10 @@
 #pragma once
 
+/*
+ *  This header defines macros for circumventing compiler quirks on which sqlite_orm depends.
+ *  May amend cxx_core_features.h
+ */
+
 #ifdef __clang__
 #define SQLITE_ORM_DO_PRAGMA(...) _Pragma(#__VA_ARGS__)
 #endif

diff --git a/dev/functional/cxx_core_features.h b/dev/functional/cxx_core_features.h
@@ -1,5 +1,10 @@
 #pragma once
 
+/*
+ *  This header detects core C++ language features on which sqlite_orm depends.
+ *  May be updated/overwritten by cxx_compiler_quirks.h
+ */
+
 #ifdef __has_cpp_attribute
 #define SQLITE_ORM_HAS_CPP_ATTRIBUTE(attr) __has_cpp_attribute(attr)
 #else

diff --git a/dev/functional/cxx_universal.h b/dev/functional/cxx_universal.h
@@ -4,7 +4,7 @@
  *  This header makes central C++ functionality on which sqlite_orm depends universally available:
  *  - alternative operator representations
  *  - ::size_t, ::ptrdiff_t, ::nullptr_t
- *  - C++ core feature macros
+ *  - C++ core language feature macros
  *  - macros for dealing with compiler quirks
  */
 

diff --git a/dev/get_prepared_statement.h b/dev/get_prepared_statement.h
@@ -1,10 +1,13 @@
 #pragma once
 
 #include <type_traits>  //  std::is_same, std::decay, std::remove_reference
+#include <tuple>  //  std::get
 
+#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/static_magic.h"
 #include "prepared_statement.h"
 #include "ast_iterator.h"
+#include "node_tuple.h"
 #include "expression_object_type.h"
 
 namespace sqlite_orm {

diff --git a/dev/select_constraints.h b/dev/select_constraints.h
@@ -409,7 +409,7 @@ namespace sqlite_orm {
         return {definedOrder};
     }
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<auto als, internal::satisfies<internal::is_recordset_alias, decltype(als)> = true>
     auto asterisk(bool definedOrder = false) {
         return internal::asterisk_t<std::remove_const_t<decltype(als)>>{definedOrder};

diff --git a/examples/column_aliases.cpp b/examples/column_aliases.cpp
@@ -58,7 +58,7 @@ void marvel_hero_ordered_by_o_pos() {
         }
     }
     cout << endl;
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     {
         //  SELECT name, instr(abilities, 'o') i
         //  FROM marvel

diff --git a/examples/custom_aliases.cpp b/examples/custom_aliases.cpp
@@ -104,7 +104,7 @@ int main(int, char** argv) {
     //  SELECT C.ID, C.NAME, C.AGE, D.DEPT
     //  FROM COMPANY AS C, DEPARTMENT AS D
     //  WHERE  C.ID = D.EMP_ID;
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     constexpr auto c_als = "c"_alias.for_<Employee>();
     constexpr auto d = "d"_alias.for_<Department>();
     static_assert(std::is_empty_v<EmployeeIdAlias>);

diff --git a/examples/exists.cpp b/examples/exists.cpp
@@ -475,7 +475,7 @@ int main(int, char**) {
         //      )
         //  ORDER BY 'c'."PAYMENT_AMT"
 
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         constexpr auto c_als = "c"_alias.for_<Customer>();
         constexpr auto d = "d"_alias.for_<Customer>();
 

diff --git a/examples/self_join.cpp b/examples/self_join.cpp
@@ -199,7 +199,7 @@ int main() {
         //  FROM employees
         //  INNER JOIN employees m
         //  ON m.ReportsTo = employees.EmployeeId
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         constexpr auto m = "m"_alias.for_<Employee>();
         auto firstNames = storage.select(columns(m->*&Employee::firstName || c(" ") || m->*&Employee::lastName,
                                                  &Employee::firstName || c(" ") || &Employee::lastName),
@@ -230,7 +230,7 @@ int main() {
         //  FROM employees
         //  INNER JOIN employees emp
         //  ON emp.ReportsTo = employees.EmployeeId
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         static_assert(std::is_empty_v<custom_alias<Employee>>);
         constexpr auto emp = custom_alias<Employee>{};
         auto firstNames = storage.select(columns(emp->*&Employee::firstName || c(" ") || emp->*&Employee::lastName,

diff --git a/examples/subquery.cpp b/examples/subquery.cpp
@@ -1346,7 +1346,7 @@ int main(int, char**) {
         //  WHERE salary >(SELECT AVG(salary)
         //      FROM employees
         //      WHERE department_id = e.department_id);
-#ifdef SQLITE_ORM_CLASSTYPE_TEMPLATE_ARGS_SUPPORTED
+#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
         constexpr auto e = "e"_alias.for_<Employee>();
         auto rows = storage.select(
             columns(e->*&Employee::lastName, e->*&Employee::salary, e->*&Employee::departmentId),