Added _EXPORT_SQLITE_ORM macro to clang-format's StatementMacros

fnc12 · Jul 24, 2024 · e7d7783 · e7d7783
1 parent 996bcbc
commit e7d7783
Show file tree

Hide file tree

Showing 54 changed files with 365 additions and 266 deletions.
diff --git a/.clang-format b/.clang-format
@@ -118,6 +118,7 @@ AttributeMacros: [SQLITE_ORM_CPP_LIKELY, SQLITE_ORM_CPP_UNLIKELY]
 StatementMacros: 
   - __pragma
   - _Pragma
+  - _EXPORT_SQLITE_ORM
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        4

diff --git a/dev/alias.h b/dev/alias.h
@@ -189,7 +189,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Using a column pointer, create a column reference to an aliased table column.
      *  

diff --git a/dev/alias_traits.h b/dev/alias_traits.h
@@ -11,7 +11,8 @@
 #include "type_traits.h"
 #include "table_reference.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** @short Base class for a custom table alias, column alias or expression alias.
      */
@@ -71,7 +72,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<class A>
     concept orm_alias = std::derived_from<A, alias_tag>;

diff --git a/dev/arg_values.h b/dev/arg_values.h
@@ -4,7 +4,8 @@
 
 #include "row_extractor.h"
 
-_EXPORT_SQLITE_ORM 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
@@ -6,7 +6,8 @@
 
 #include "functional/mpl/conditional.h"
 
-_EXPORT_SQLITE_ORM 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
@@ -16,7 +16,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class T>
     internal::excluded_t<T> excluded(T expression) {
         return {std::move(expression)};

diff --git a/dev/ast/exists.h b/dev/ast/exists.h
@@ -21,7 +21,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  EXISTS(condition).
      *  Example: storage.select(columns(&Agent::code, &Agent::name, &Agent::workingArea, &Agent::comission),

diff --git a/dev/ast/group_by.h b/dev/ast/group_by.h
@@ -41,7 +41,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  GROUP BY column.
      *  Example: storage.get_all<Employee>(group_by(&Employee::name))

diff --git a/dev/ast/into.h b/dev/ast/into.h
@@ -15,7 +15,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class T>
     internal::into_t<T> into() {
         return {};

diff --git a/dev/ast/match.h b/dev/ast/match.h
@@ -4,7 +4,8 @@
 #include <utility>
 #endif
 
-_EXPORT_SQLITE_ORM 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
@@ -6,7 +6,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::rank_t rank() {
         return {};
     }

diff --git a/dev/ast/set.h b/dev/ast/set.h
@@ -89,7 +89,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  SET keyword used in UPDATE ... SET queries.
      *  Args must have `assign_t` type. E.g. set(assign(&User::id, 5)) or set(c(&User::id) = 5)

diff --git a/dev/ast/special_keywords.h b/dev/ast/special_keywords.h
@@ -8,7 +8,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::current_time_t current_time() {
         return {};
     }

diff --git a/dev/ast/upsert_clause.h b/dev/ast/upsert_clause.h
@@ -55,7 +55,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #if SQLITE_VERSION_NUMBER >= 3024000
     /**
      *  ON CONFLICT upsert clause builder function.

diff --git a/dev/ast/where.h b/dev/ast/where.h
@@ -39,7 +39,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  WHERE clause. Use it to add WHERE conditions wherever you like.
      *  C is expression type. Can be any expression like: is_equal_t, is_null_t, exists_t etc

diff --git a/dev/carray.h b/dev/carray.h
@@ -21,7 +21,8 @@
 
 #if SQLITE_VERSION_NUMBER >= 3020000
 #ifdef SQLITE_ORM_INLINE_VARIABLES_SUPPORTED
-_EXPORT_SQLITE_ORM 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;
@@ -43,12 +44,12 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<class P, class D>
-    carray_pointer_binding<P, D> bind_carray_pointer(P * p, D d) noexcept {
+    carray_pointer_binding<P, D> bind_carray_pointer(P* p, D d) noexcept {
         return bind_pointer<carray_pointer_tag>(p, std::move(d));
     }
 
     template<class P>
-    static_carray_pointer_binding<P> bind_carray_pointer_statically(P * p) noexcept {
+    static_carray_pointer_binding<P> bind_carray_pointer_statically(P* p) noexcept {
         return bind_pointer_statically<carray_pointer_tag>(p);
     }
 
@@ -60,14 +61,14 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      */
     template<class P, class D>
     [[deprecated("Use the better named function `bind_carray_pointer(...)`")]] carray_pointer_binding<P, D>
-    bindable_carray_pointer(P * p, D d) noexcept {
+    bindable_carray_pointer(P* p, D d) noexcept {
         return bind_pointer<carray_pointer_tag>(p, std::move(d));
     }
 
     template<class P>
     [[deprecated(
         "Use the better named function `bind_carray_pointer_statically(...)` ")]] static_carray_pointer_binding<P>
-    statically_bindable_carray_pointer(P * p) noexcept {
+    statically_bindable_carray_pointer(P* p) noexcept {
         return bind_pointer_statically<carray_pointer_tag>(p);
     }
 #else
@@ -91,7 +92,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<class P, class D>
-    carray_pointer_binding<P, D> bind_carray_pointer(P * p, D d) noexcept {
+    carray_pointer_binding<P, D> bind_carray_pointer(P* p, D d) noexcept {
         return bind_pointer<carray_pointer_type>(p, std::move(d));
     }
 
@@ -102,20 +103,20 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  and sqlite assumes the object pointed to is valid throughout the lifetime of a statement.
      */
     template<class P>
-    static_carray_pointer_binding<P> bind_carray_pointer_statically(P * p) noexcept {
+    static_carray_pointer_binding<P> bind_carray_pointer_statically(P* p) noexcept {
         return bind_pointer_statically<carray_pointer_type>(p);
     }
 
     template<class P, class D>
     [[deprecated("Use the better named function `bind_carray_pointer(...)`")]] carray_pointer_binding<P, D>
-    bindable_carray_pointer(P * p, D d) noexcept {
+    bindable_carray_pointer(P* p, D d) noexcept {
         return bind_carray_pointer(p, std::move(d));
     }
 
     template<class P>
     [[deprecated(
         "Use the better named function `bind_carray_pointer_statically(...)` ")]] static_carray_pointer_binding<P>
-    statically_bindable_carray_pointer(P * p) noexcept {
+    statically_bindable_carray_pointer(P* p) noexcept {
         return bind_carray_pointer_statically(p);
     }
 #endif

diff --git a/dev/column_pointer.h b/dev/column_pointer.h
@@ -44,7 +44,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Explicitly refer to a column, used in contexts
      *  where the automatic object mapping deduction needs to be overridden.

diff --git a/dev/conditions.h b/dev/conditions.h
@@ -824,7 +824,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Explicit FROM function. Usage:
      *  `storage.select(&User::id, from<User>());`
@@ -1238,8 +1239,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  }
      */
     template<class S>
-    internal::dynamic_order_by_t<internal::serializer_context<typename S::db_objects_type>> dynamic_order_by(
-        const S& storage) {
+    internal::dynamic_order_by_t<internal::serializer_context<typename S::db_objects_type>>
+    dynamic_order_by(const S& storage) {
         internal::serializer_context_builder<S> builder(storage);
         return builder();
     }

diff --git a/dev/constraints.h b/dev/constraints.h
@@ -511,7 +511,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #if SQLITE_VERSION_NUMBER >= 3031000
     template<class T>
     internal::generated_always_t<T> generated_always_as(T expression) {

diff --git a/dev/core_functions.h b/dev/core_functions.h
@@ -630,7 +630,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     using int64 = sqlite_int64;
     using uint64 = sqlite_uint64;
@@ -1673,28 +1674,27 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      */
     template<class R = void, class... Args>
     auto coalesce(Args... args)
-        ->internal::built_in_function_t<typename mpl::conditional_t<  //  choose R or common type
-                                            std::is_void<R>::value,
-                                            std::common_type<internal::field_type_or_type_t<Args>...>,
-                                            polyfill::type_identity<R>>::type,
-                                        internal::coalesce_string,
-                                        Args...> {
+        -> internal::built_in_function_t<typename mpl::conditional_t<  //  choose R or common type
+                                             std::is_void<R>::value,
+                                             std::common_type<internal::field_type_or_type_t<Args>...>,
+                                             polyfill::type_identity<R>>::type,
+                                         internal::coalesce_string,
+                                         Args...> {
         return {std::make_tuple(std::forward<Args>(args)...)};
     }
 
     /**
      *  IFNULL(X,Y) function https://www.sqlite.org/lang_corefunc.html#ifnull
      */
     template<class R = void, class X, class Y>
-    auto ifnull(X x, Y y)
-        ->internal::built_in_function_t<
-            typename mpl::conditional_t<  //  choose R or common type
-                std::is_void<R>::value,
-                std::common_type<internal::field_type_or_type_t<X>, internal::field_type_or_type_t<Y>>,
-                polyfill::type_identity<R>>::type,
-            internal::ifnull_string,
-            X,
-            Y> {
+    auto ifnull(X x, Y y) -> internal::built_in_function_t<
+        typename mpl::conditional_t<  //  choose R or common type
+            std::is_void<R>::value,
+            std::common_type<internal::field_type_or_type_t<X>, internal::field_type_or_type_t<Y>>,
+            polyfill::type_identity<R>>::type,
+        internal::ifnull_string,
+        X,
+        Y> {
         return {std::make_tuple(std::move(x), std::move(y))};
     }
 
@@ -1889,10 +1889,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  The return type is the type of the first argument.
      */
     template<class X, class Y, class... Rest>
-    internal::built_in_function_t<internal::unique_ptr_result_of<X>, internal::max_string, X, Y, Rest...> max(
-        X x,
-        Y y,
-        Rest... rest) {
+    internal::built_in_function_t<internal::unique_ptr_result_of<X>, internal::max_string, X, Y, Rest...>
+    max(X x, Y y, Rest... rest) {
         return {std::tuple<X, Y, Rest...>{std::forward<X>(x), std::forward<Y>(y), std::forward<Rest>(rest)...}};
     }
 
@@ -1901,10 +1899,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  The return type is the type of the first argument.
      */
     template<class X, class Y, class... Rest>
-    internal::built_in_function_t<internal::unique_ptr_result_of<X>, internal::min_string, X, Y, Rest...> min(
-        X x,
-        Y y,
-        Rest... rest) {
+    internal::built_in_function_t<internal::unique_ptr_result_of<X>, internal::min_string, X, Y, Rest...>
+    min(X x, Y y, Rest... rest) {
         return {std::tuple<X, Y, Rest...>{std::forward<X>(x), std::forward<Y>(y), std::forward<Rest>(rest)...}};
     }
 

diff --git a/dev/cte_moniker.h b/dev/cte_moniker.h
@@ -67,7 +67,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline namespace literals {
         /**
          *  cte_moniker<'n'> from a numeric literal.

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