First attempt to offer sqlite_orm as a named C++ module

fnc12 · Jul 16, 2024 · 7e2f578 · 7e2f578
1 parent 64342a0
commit 7e2f578
Show file tree

Hide file tree

Showing 66 changed files with 93 additions and 72 deletions.
diff --git a/dev/alias.h b/dev/alias.h
@@ -17,7 +17,7 @@
 #include "tags.h"
 #include "column_pointer.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES

diff --git a/dev/alias_traits.h b/dev/alias_traits.h
@@ -10,7 +10,7 @@
 #include "type_traits.h"
 #include "table_reference.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /** @short Base class for a custom table alias, column alias or expression alias.
      */

diff --git a/dev/arg_values.h b/dev/arg_values.h
@@ -4,7 +4,7 @@
 
 #include "row_extractor.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /** @short Wrapper around a dynamically typed value object.
      */

diff --git a/dev/arithmetic_tag.h b/dev/arithmetic_tag.h
@@ -3,7 +3,7 @@
 
 #include "functional/mpl/conditional.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /**
      *  Helper classes used by statement_binder and row_extractor.

diff --git a/dev/ast/excluded.h b/dev/ast/excluded.h
@@ -2,7 +2,7 @@
 
 #include <utility>  //  std::move
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         template<class T>

diff --git a/dev/ast/exists.h b/dev/ast/exists.h
@@ -4,7 +4,7 @@
 
 #include "../tags.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         template<class T>

diff --git a/dev/ast/group_by.h b/dev/ast/group_by.h
@@ -6,7 +6,7 @@
 
 #include "../functional/cxx_type_traits_polyfill.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         template<class T, class... Args>

diff --git a/dev/ast/into.h b/dev/ast/into.h
@@ -2,7 +2,7 @@
 
 #include "../functional/cxx_type_traits_polyfill.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         template<class T>

diff --git a/dev/ast/match.h b/dev/ast/match.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         template<class T, class X>

diff --git a/dev/ast/rank.h b/dev/ast/rank.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
         struct rank_t {};
     }

diff --git a/dev/ast/set.h b/dev/ast/set.h
@@ -9,7 +9,7 @@
 #include "../tuple_helper/tuple_traits.h"
 #include "../table_name_collector.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/ast/special_keywords.h b/dev/ast/special_keywords.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
         struct current_time_t {};
         struct current_date_t {};

diff --git a/dev/ast/upsert_clause.h b/dev/ast/upsert_clause.h
@@ -7,7 +7,7 @@
 
 #include "../functional/cxx_type_traits_polyfill.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 #if SQLITE_VERSION_NUMBER >= 3024000
         template<class T, class A>

diff --git a/dev/ast/where.h b/dev/ast/where.h
@@ -7,7 +7,7 @@
 #include "../functional/cxx_type_traits_polyfill.h"
 #include "../serialize_result_type.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         struct where_string {

diff --git a/dev/ast_iterator.h b/dev/ast_iterator.h
@@ -22,7 +22,7 @@
 #include "ast/set.h"
 #include "ast/match.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/backup.h b/dev/backup.h
@@ -9,7 +9,7 @@
 #include "error_code.h"
 #include "connection_holder.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/carray.h b/dev/carray.h
@@ -19,7 +19,7 @@
 
 #if SQLITE_VERSION_NUMBER >= 3020000
 #ifdef SQLITE_ORM_INLINE_VARIABLES_SUPPORTED
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     inline constexpr orm_pointer_type auto carray_pointer_tag = "carray"_pointer_type;

diff --git a/dev/collate_argument.h b/dev/collate_argument.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/column_pointer.h b/dev/column_pointer.h
@@ -10,7 +10,7 @@
 #include "alias_traits.h"
 #include "tags.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
         /**
          *  This class is used to store explicit mapped type T and its column descriptor (member pointer/getter/setter).

diff --git a/dev/conditions.h b/dev/conditions.h
@@ -25,7 +25,7 @@
 #include "type_printer.h"
 #include "literal.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 
@@ -844,7 +844,7 @@ namespace sqlite_orm {
 
     // Intentionally place operators for types classified as arithmetic or general operator arguments in the internal namespace
     // to facilitate ADL (Argument Dependent Lookup)
-    namespace internal {
+    _EXPORT_SQLITE_ORM namespace internal {
         template<
             class T,
             std::enable_if_t<polyfill::disjunction<std::is_base_of<negatable_t, T>, is_operator_argument<T>>::value,

diff --git a/dev/constraints.h b/dev/constraints.h
@@ -18,7 +18,7 @@
 #include "table_type_of.h"
 #include "type_printer.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/core_functions.h b/dev/core_functions.h
@@ -17,7 +17,7 @@
 #include "table_reference.h"
 #include "ast/into.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     using int64 = sqlite_int64;
     using uint64 = sqlite_uint64;
@@ -2040,7 +2040,7 @@ namespace sqlite_orm {
 
     // Intentionally place operators for types classified as arithmetic or general operator arguments in the internal namespace
     // to facilitate ADL (Argument Dependent Lookup)
-    namespace internal {
+    _EXPORT_SQLITE_ORM namespace internal {
         template<class L,
                  class R,
                  std::enable_if_t<polyfill::disjunction<std::is_base_of<arithmetic_t, L>,

diff --git a/dev/cte_moniker.h b/dev/cte_moniker.h
@@ -15,7 +15,7 @@
 #include "alias.h"
 
 #if(SQLITE_VERSION_NUMBER >= 3008003) && defined(SQLITE_ORM_WITH_CTE)
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
         /** 

diff --git a/dev/cte_storage.h b/dev/cte_storage.h
@@ -62,15 +62,15 @@ namespace sqlite_orm {
 
         // aliased column expressions, explicit or implicitly numbered
         template<typename F, typename ColRef, satisfies_is_specialization_of<ColRef, alias_holder> = true>
-        static auto make_cte_column(std::string name, const ColRef& /*finalColRef*/) {
+        auto make_cte_column(std::string name, const ColRef& /*finalColRef*/) {
             using object_type = aliased_field<type_t<ColRef>, F>;
 
             return sqlite_orm::make_column<>(std::move(name), &object_type::field);
         }
 
         // F O::*
         template<typename F, typename ColRef, satisfies<std::is_member_pointer, ColRef> = true>
-        static auto make_cte_column(std::string name, const ColRef& finalColRef) {
+        auto make_cte_column(std::string name, const ColRef& finalColRef) {
             using object_type = table_type_of_t<ColRef>;
             using column_type = column_t<ColRef, empty_setter>;
 

diff --git a/dev/cte_types.h b/dev/cte_types.h
@@ -10,7 +10,7 @@
 #include "tuple_helper/tuple_fy.h"
 
 #if(SQLITE_VERSION_NUMBER >= 3008003) && defined(SQLITE_ORM_WITH_CTE)
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/eponymous_vtabs/dbstat.h b/dev/eponymous_vtabs/dbstat.h
@@ -7,7 +7,7 @@
 #include "../schema/column.h"
 #include "../schema/table.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 #ifdef SQLITE_ENABLE_DBSTAT_VTAB
     struct dbstat {
         std::string name;

diff --git a/dev/error_code.h b/dev/error_code.h
@@ -7,7 +7,7 @@
 #include <sstream>  //  std::ostringstream
 #include <type_traits>
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /** @short Enables classifying sqlite error codes.
 
@@ -50,7 +50,7 @@ namespace std {
     struct is_error_code_enum<::sqlite_orm::orm_error_code> : true_type {};
 }
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     class orm_error_category : public std::error_category {
       public:

diff --git a/dev/expression.h b/dev/expression.h
@@ -9,7 +9,7 @@
 #include "functional/cxx_type_traits_polyfill.h"
 #include "tags.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/field_printer.h b/dev/field_printer.h
@@ -15,7 +15,7 @@
 #include "is_std_ptr.h"
 #include "type_traits.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /**
      *  Is used to print members mapped to objects in storage_t::dump member function.

diff --git a/dev/function.h b/dev/function.h
@@ -15,7 +15,7 @@
 #include "type_traits.h"
 #include "tags.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     struct arg_values;
 

diff --git a/dev/functional/config.h b/dev/functional/config.h
@@ -2,6 +2,12 @@
 
 #include "cxx_universal.h"
 
+#ifdef _BUILD_SQLITE_ORM_MODULE
+#define _EXPORT_SQLITE_ORM export
+#else
+#define _EXPORT_SQLITE_ORM
+#endif
+
 #if SQLITE_ORM_HAS_INCLUDE(<version>)
 #include <version>
 #endif

diff --git a/dev/get_prepared_statement.h b/dev/get_prepared_statement.h
@@ -12,7 +12,7 @@
 #include "node_tuple.h"
 #include "expression_object_type.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     template<int N, class It, class L, class O>
     auto& get(internal::prepared_statement_t<internal::insert_range_t<It, L, O>>& statement) {

diff --git a/dev/indexed_column.h b/dev/indexed_column.h
@@ -6,7 +6,7 @@
 #include "functional/cxx_universal.h"
 #include "ast/where.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/is_std_ptr.h b/dev/is_std_ptr.h
@@ -2,7 +2,7 @@
 #include <type_traits>
 #include <memory>
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /**
      *  Specialization for optional type (std::shared_ptr / std::unique_ptr).

diff --git a/dev/journal_mode.h b/dev/journal_mode.h
@@ -13,7 +13,7 @@
 #undef DELETE
 #endif
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     /**
      *  Caps case because of:

diff --git a/dev/limit_accessor.h b/dev/limit_accessor.h
@@ -7,7 +7,7 @@
 
 #include "connection_holder.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/literal.h b/dev/literal.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
 
         /* 

diff --git a/dev/member_traits/member_traits.h b/dev/member_traits/member_traits.h
@@ -5,7 +5,7 @@
 #include "../functional/cxx_universal.h"
 #include "../functional/cxx_type_traits_polyfill.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
     namespace internal {
         // SFINAE friendly trait to get a member object pointer's field type
         template<class T>

diff --git a/dev/object_from_column_builder.h b/dev/object_from_column_builder.h
@@ -11,7 +11,7 @@
 #include "schema/column.h"
 #include "storage_lookup.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {
 

diff --git a/dev/operators.h b/dev/operators.h
@@ -8,7 +8,7 @@
 #include "tags.h"
 #include "serialize_result_type.h"
 
-namespace sqlite_orm {
+_EXPORT_SQLITE_ORM namespace sqlite_orm {
 
     namespace internal {