diff --git a/.clang-format b/.clang-format
index b5b9729f..7c52646f 100644
--- 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
index e98dd2c9..636264f9 100644
--- 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
index 9f9467c5..4249e836 100644
--- 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
index 34f31f66..d1a7c408 100644
--- 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
index c7fd0cec..ac7be670 100644
--- 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
index 85d81427..9462ef30 100644
--- 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
index 65e653ed..f95f280f 100644
--- 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
index 8872312a..2f6f886c 100644
--- 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
index f513e37f..2e359841 100644
--- 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
index 76722425..05b72680 100644
--- 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
index 02d5aef4..9437031e 100644
--- 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
index 0077f357..ebc9f848 100644
--- 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
index 2d08e682..73034057 100644
--- 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
index f757ab92..48239f44 100644
--- 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
index ddf8ef73..cb545e4a 100644
--- 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
index b0f6a35b..75934898 100644
--- 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
index ae353023..b4b1b6b2 100644
--- 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
index 1316a1e7..40911943 100644
--- 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
index 8bd6b0fe..8a8adcbe 100644
--- 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
index 0d729a24..a706bdc7 100644
--- 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,12 +1674,12 @@ _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)...)};
     }
 
@@ -1686,15 +1687,14 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  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
index 6e25f144..3187622e 100644
--- 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
index 03d6b06f..645d8091 100644
--- 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;
diff --git a/dev/error_code.h b/dev/error_code.h
index a5705d2a..33981d92 100644
--- a/dev/error_code.h
+++ b/dev/error_code.h
@@ -9,7 +9,8 @@
 #include <type_traits>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** @short Enables classifying sqlite error codes.
 
@@ -51,7 +52,8 @@ namespace std {
     struct is_error_code_enum<::sqlite_orm::orm_error_code> : true_type {};
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     class orm_error_category : public std::error_category {
       public:
@@ -135,7 +137,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename... T>
-    std::string get_error_message(sqlite3 * db, T && ... args) {
+    std::string get_error_message(sqlite3* db, T&&... args) {
         std::ostringstream stream;
         using unpack = int[];
         (void)unpack{0, (stream << args, 0)...};
@@ -144,7 +146,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename... T>
-    [[noreturn]] void throw_error(sqlite3 * db, T && ... args) {
+    [[noreturn]] void throw_error(sqlite3* db, T&&... args) {
         throw std::system_error{sqlite_errc(sqlite3_errcode(db)), get_error_message(db, std::forward<T>(args)...)};
     }
 
@@ -152,7 +154,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
         return {sqlite_errc(ev)};
     }
 
-    inline std::system_error sqlite_to_system_error(sqlite3 * db) {
+    inline std::system_error sqlite_to_system_error(sqlite3* db) {
         return {sqlite_errc(sqlite3_errcode(db)), sqlite3_errmsg(db)};
     }
 
@@ -160,11 +162,11 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
         throw sqlite_to_system_error(ev);
     }
 
-    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3 * db) {
+    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3* db) {
         throw sqlite_to_system_error(db);
     }
 
-    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3_stmt * stmt) {
+    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3_stmt* stmt) {
         throw sqlite_to_system_error(sqlite3_db_handle(stmt));
     }
 }
diff --git a/dev/expression.h b/dev/expression.h
index 9593a4fa..6cc998f5 100644
--- a/dev/expression.h
+++ b/dev/expression.h
@@ -84,7 +84,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Public interface for syntax sugar for columns. Example: `where(c(&User::id) == 5)` or
      * `storage.update(set(c(&User::name) = "Dua Lipa"));
diff --git a/dev/field_printer.h b/dev/field_printer.h
index 89138d17..2b99f8a3 100644
--- a/dev/field_printer.h
+++ b/dev/field_printer.h
@@ -16,7 +16,8 @@
 #include "is_std_ptr.h"
 #include "type_traits.h"
 
-_EXPORT_SQLITE_ORM 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
index ed37f484..6ee11c32 100644
--- a/dev/function.h
+++ b/dev/function.h
@@ -64,7 +64,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     /** @short Specifies that a type is a function signature (i.e. a function in the C++ type system).
      */
@@ -496,7 +497,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /** @short Call a user-defined function.
      *  
      *  Note: Currently the number of call arguments is checked and whether the types of pointer values match,
diff --git a/dev/get_prepared_statement.h b/dev/get_prepared_statement.h
index 15dbbd4c..bd393340 100644
--- a/dev/get_prepared_statement.h
+++ b/dev/get_prepared_statement.h
@@ -13,10 +13,11 @@
 #include "node_tuple.h"
 #include "expression_object_type.h"
 
-_EXPORT_SQLITE_ORM 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) {
+    auto& get(internal::prepared_statement_t<internal::insert_range_t<It, L, O>>& statement) {
         return std::get<N>(statement.expression.range);
     }
 
@@ -26,7 +27,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class It, class L, class O>
-    auto& get(internal::prepared_statement_t<internal::replace_range_t<It, L, O>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::replace_range_t<It, L, O>>& statement) {
         return std::get<N>(statement.expression.range);
     }
 
@@ -36,7 +37,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -46,7 +47,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_pointer_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_pointer_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -57,7 +58,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_optional_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_optional_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -68,7 +69,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #endif  // SQLITE_ORM_OPTIONAL_SUPPORTED
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::remove_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::remove_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -78,7 +79,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::update_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::update_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for update statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -90,7 +91,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Cols>
-    auto& get(internal::prepared_statement_t<internal::insert_explicit<T, Cols...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::insert_explicit<T, Cols...>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for insert statement");
         return internal::get_ref(statement.expression.obj);
     }
@@ -102,7 +103,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::replace_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::replace_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for replace statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -114,7 +115,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::insert_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::insert_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for insert statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -151,7 +152,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<T> & statement) {
+    auto& get(internal::prepared_statement_t<T>& statement) {
         using statement_type = std::remove_reference_t<decltype(statement)>;
         using expression_type = internal::expression_type_t<statement_type>;
         using node_tuple = internal::node_tuple_t<expression_type>;
diff --git a/dev/indexed_column.h b/dev/indexed_column.h
index c7937d6e..989728e8 100644
--- a/dev/indexed_column.h
+++ b/dev/indexed_column.h
@@ -60,7 +60,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      * Use this function to specify indexed column inside `make_index` function call.
      * Example: make_index("index_name", indexed_column(&User::id).asc())
diff --git a/dev/is_std_ptr.h b/dev/is_std_ptr.h
index cd9b78e0..81cda32d 100644
--- a/dev/is_std_ptr.h
+++ b/dev/is_std_ptr.h
@@ -5,7 +5,8 @@
 #include <memory>
 #endif
 
-_EXPORT_SQLITE_ORM 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
index 47eaf4be..84f1801a 100644
--- a/dev/journal_mode.h
+++ b/dev/journal_mode.h
@@ -15,7 +15,8 @@
 #undef DELETE
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Caps case because of:
diff --git a/dev/operators.h b/dev/operators.h
index 90548b7f..1bdcdf9f 100644
--- a/dev/operators.h
+++ b/dev/operators.h
@@ -195,7 +195,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Public interface for || concatenation operator. Example: `select(conc(&User::name, "@gmail.com"));` => SELECT
      * name || '@gmail.com' FROM users
diff --git a/dev/pointer_value.h b/dev/pointer_value.h
index 31b61385..a0a2e037 100644
--- a/dev/pointer_value.h
+++ b/dev/pointer_value.h
@@ -27,7 +27,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     inline namespace literals {
         template<internal::cstring_literal tag>
@@ -190,7 +191,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #endif
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Wrap a pointer, its type and its deleter function for binding it to a statement.
      *  
@@ -199,7 +201,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<class T, class P, class D>
-    auto bind_pointer(P * p, D d) noexcept -> pointer_binding<P, T, D> {
+    auto bind_pointer(P* p, D d) noexcept -> pointer_binding<P, T, D> {
         return {p, std::move(d)};
     }
 
@@ -209,27 +211,25 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename B>
-    auto bind_pointer(typename B::qualified_type * p, typename B::deleter_type d = {}) noexcept -> B {
+    auto bind_pointer(typename B::qualified_type* p, typename B::deleter_type d = {}) noexcept -> B {
         return B{p, std::move(d)};
     }
 
     template<class T, class P, class D>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D> bindable_pointer(
-        P * p,
-        D d) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D>
+    bindable_pointer(P* p, D d) noexcept {
         return bind_pointer<T>(p, std::move(d));
     }
 
     template<class T, class P, class D>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D> bindable_pointer(
-        std::unique_ptr<P, D> p) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D>
+    bindable_pointer(std::unique_ptr<P, D> p) noexcept {
         return bind_pointer<T>(p.release(), p.get_deleter());
     }
 
     template<typename B>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] B bindable_pointer(
-        typename B::qualified_type * p,
-        typename B::deleter_type d = {}) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] B
+    bindable_pointer(typename B::qualified_type* p, typename B::deleter_type d = {}) noexcept {
         return bind_pointer<B>(p, std::move(d));
     }
 
@@ -242,7 +242,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<orm_pointer_type auto tag, class P, class D>
-    auto bind_pointer(P * p, D d) noexcept -> pointer_binding<P, decltype(tag), D> {
+    auto bind_pointer(P* p, D d) noexcept -> pointer_binding<P, decltype(tag), D> {
         return {p, std::move(d)};
     }
 
@@ -259,26 +259,26 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  and sqlite assumes the object pointed to is valid throughout the lifetime of a statement.
      */
     template<class T, class P>
-    auto bind_pointer_statically(P * p) noexcept -> static_pointer_binding<P, T> {
+    auto bind_pointer_statically(P* p) noexcept -> static_pointer_binding<P, T> {
         return bind_pointer<T>(p, null_xdestroy_f);
     }
 
     template<typename B>
-    B bind_pointer_statically(typename B::qualified_type * p,
+    B bind_pointer_statically(typename B::qualified_type* p,
                               typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
         return bind_pointer<B>(p);
     }
 
     template<class T, class P>
     [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] static_pointer_binding<P, T>
-    statically_bindable_pointer(P * p) noexcept {
+    statically_bindable_pointer(P* p) noexcept {
         return bind_pointer<T>(p, null_xdestroy_f);
     }
 
     template<typename B>
-    [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] B statically_bindable_pointer(
-        typename B::qualified_type * p,
-        typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
+    [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] B
+    statically_bindable_pointer(typename B::qualified_type* p,
+                                typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
         return bind_pointer<B>(p);
     }
 
@@ -290,7 +290,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  and sqlite assumes the object pointed to is valid throughout the lifetime of a statement.
      */
     template<orm_pointer_type auto tag, class P>
-    auto bind_pointer_statically(P * p) noexcept -> static_pointer_binding<P, decltype(tag)> {
+    auto bind_pointer_statically(P* p) noexcept -> static_pointer_binding<P, decltype(tag)> {
         return bind_pointer<tag>(p, null_xdestroy_f);
     }
 #endif
diff --git a/dev/prepared_statement.h b/dev/prepared_statement.h
index 426f12a8..cd58d3c7 100644
--- a/dev/prepared_statement.h
+++ b/dev/prepared_statement.h
@@ -326,7 +326,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::insert_constraint or_rollback() {
         return {internal::conflict_action::rollback};
     }
@@ -754,7 +755,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     template<orm_refers_to_table auto mapped,
              class R = std::vector<internal::mapped_type_proxy_t<decltype(mapped)>>,
              class... Args>
-    auto get_all(Args && ... conditions) {
+    auto get_all(Args&&... conditions) {
         return get_all<internal::auto_decay_table_ref_t<mapped>, R>(std::forward<Args>(conditions)...);
     }
 #endif
@@ -824,7 +825,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     template<orm_table_reference auto table,
              class R = std::vector<internal::auto_decay_table_ref_t<table>>,
              class... Args>
-    auto get_all_optional(Args && ... conditions) {
+    auto get_all_optional(Args&&... conditions) {
         return get_all_optional<internal::auto_decay_table_ref_t<table>, R>(std::forward<Args>(conditions)...);
     }
 #endif
diff --git a/dev/row_extractor.h b/dev/row_extractor.h
index c98cd4df..445d90b8 100644
--- a/dev/row_extractor.h
+++ b/dev/row_extractor.h
@@ -31,7 +31,8 @@
 #include "is_std_ptr.h"
 #include "type_traits.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Helper for casting values originating from SQL to C++ typed values, usually from rows of a result set.
@@ -121,7 +122,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class R>
     int extract_single_value(void* data, int argc, char** argv, char**) {
         auto& res = *(R*)data;
diff --git a/dev/rowid.h b/dev/rowid.h
index 6d52ea5f..9e612b86 100644
--- a/dev/rowid.h
+++ b/dev/rowid.h
@@ -43,7 +43,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::rowid_t rowid() {
         return {};
     }
diff --git a/dev/schema/column.h b/dev/schema/column.h
index 08c7ab88..0f66ce23 100644
--- a/dev/schema/column.h
+++ b/dev/schema/column.h
@@ -145,14 +145,14 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Factory function for a column definition from a member object pointer of the object to be mapped.
      */
     template<class M, class... Op, internal::satisfies<std::is_member_object_pointer, M> = true>
-    internal::column_t<M, internal::empty_setter, Op...> make_column(std::string name,
-                                                                     M memberPointer,
-                                                                     Op... constraints) {
+    internal::column_t<M, internal::empty_setter, Op...>
+    make_column(std::string name, M memberPointer, Op... constraints) {
         static_assert(polyfill::conjunction_v<internal::is_column_constraint<Op>...>, "Incorrect constraints pack");
 
         // attention: do not use `std::make_tuple()` for constructing the tuple member `[[no_unique_address]] column_constraints::constraints`,
diff --git a/dev/schema/index.h b/dev/schema/index.h
index 093af68a..1745c58f 100644
--- a/dev/schema/index.h
+++ b/dev/schema/index.h
@@ -39,7 +39,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class T, class... Cols>
     internal::index_t<T, decltype(internal::make_indexed_column(std::declval<Cols>()))...> make_index(std::string name,
                                                                                                       Cols... cols) {
diff --git a/dev/schema/table.h b/dev/schema/table.h
index c78d3c88..50d3c8ce 100644
--- a/dev/schema/table.h
+++ b/dev/schema/table.h
@@ -418,7 +418,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #if SQLITE_VERSION_NUMBER >= 3009000
     template<class... Cs, class T = typename std::tuple_element_t<0, std::tuple<Cs...>>::object_type>
     internal::using_fts5_t<T, Cs...> using_fts5(Cs... columns) {
diff --git a/dev/schema/triggers.h b/dev/schema/triggers.h
index 49acd3e6..18a8ca53 100644
--- a/dev/schema/triggers.h
+++ b/dev/schema/triggers.h
@@ -227,7 +227,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  NEW.expression function used within TRIGGER expressions
      */
diff --git a/dev/select_constraints.h b/dev/select_constraints.h
index 102c8b70..e35ff96b 100644
--- a/dev/select_constraints.h
+++ b/dev/select_constraints.h
@@ -430,7 +430,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
     template<class T>
     internal::as_optional_t<T> as_optional(T value) {
@@ -709,9 +710,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  @note The use of RECURSIVE does not force common table expressions to be recursive.
      */
     template<class Compound, class... CTEs, internal::satisfies<internal::is_compound_operator, Compound> = true>
-    internal::with_t<internal::select_t<Compound>, CTEs...> with_recursive(
-        internal::common_table_expressions<CTEs...> ctes,
-        Compound sel) {
+    internal::with_t<internal::select_t<Compound>, CTEs...>
+    with_recursive(internal::common_table_expressions<CTEs...> ctes, Compound sel) {
         return {true, std::move(ctes), sqlite_orm::select(std::move(sel))};
     }
 
diff --git a/dev/sqlite_schema_table.h b/dev/sqlite_schema_table.h
index f1829d67..9956ca33 100644
--- a/dev/sqlite_schema_table.h
+++ b/dev/sqlite_schema_table.h
@@ -9,7 +9,8 @@
 #include "column_pointer.h"
 #include "alias.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /** 
      *  SQLite's "schema table" that stores the schema for a database.
      *  
diff --git a/dev/statement_binder.h b/dev/statement_binder.h
index 3cc8999e..a4c24b07 100644
--- a/dev/statement_binder.h
+++ b/dev/statement_binder.h
@@ -27,7 +27,8 @@
 #include "xdestroy_handling.h"
 #include "pointer_value.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Helper class used for binding fields to sqlite3 statements.
diff --git a/dev/statement_finalizer.h b/dev/statement_finalizer.h
index 8a72c469..1439742b 100644
--- a/dev/statement_finalizer.h
+++ b/dev/statement_finalizer.h
@@ -6,7 +6,8 @@
 #include <type_traits>  // std::integral_constant
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Guard class which finalizes `sqlite3_stmt` in dtor
diff --git a/dev/storage.h b/dev/storage.h
index ae593e6d..f2271923 100644
--- a/dev/storage.h
+++ b/dev/storage.h
@@ -1706,7 +1706,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /*
      *  Factory function for a storage, from a database file and a bunch of database object definitions.
      */
diff --git a/dev/sync_schema_result.h b/dev/sync_schema_result.h
index 27d498f1..859f31ec 100644
--- a/dev/sync_schema_result.h
+++ b/dev/sync_schema_result.h
@@ -4,7 +4,8 @@
 #include <ostream>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     enum class sync_schema_result {
 
diff --git a/dev/table_info.h b/dev/table_info.h
index 14d7daa9..b5062f7c 100644
--- a/dev/table_info.h
+++ b/dev/table_info.h
@@ -4,7 +4,8 @@
 #include <string>  //  std::string
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     struct table_info {
         int cid = 0;
diff --git a/dev/table_reference.h b/dev/table_reference.h
index c8882c90..c8417a10 100644
--- a/dev/table_reference.h
+++ b/dev/table_reference.h
@@ -37,7 +37,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     /** @short Specifies that a type is a reference of a concrete table, especially of a derived class.
      *
diff --git a/dev/type_is_nullable.h b/dev/type_is_nullable.h
index 5bed5289..84775c07 100644
--- a/dev/type_is_nullable.h
+++ b/dev/type_is_nullable.h
@@ -8,7 +8,8 @@
 
 #include "functional/cxx_type_traits_polyfill.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  This is class that tells `sqlite_orm` that type is nullable. Nullable types
diff --git a/dev/type_printer.h b/dev/type_printer.h
index 5eb9083d..df77b831 100644
--- a/dev/type_printer.h
+++ b/dev/type_printer.h
@@ -11,7 +11,8 @@
 #include "type_traits.h"
 #include "is_std_ptr.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  This class transforms a C++ type to a sqlite type name (int -> INTEGER, ...)
diff --git a/dev/type_traits.h b/dev/type_traits.h
index e9cb42f6..700f484d 100644
--- a/dev/type_traits.h
+++ b/dev/type_traits.h
@@ -140,7 +140,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     template<class T>
     concept orm_names_type = requires { typename T::type; };
diff --git a/dev/util.h b/dev/util.h
index 5164b8a7..7665d283 100644
--- a/dev/util.h
+++ b/dev/util.h
@@ -8,7 +8,8 @@
 
 #include "error_code.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** 
      *  Escape the provided character in the given string by doubling it.
diff --git a/dev/values.h b/dev/values.h
index b2335d8d..16805ff2 100644
--- a/dev/values.h
+++ b/dev/values.h
@@ -33,7 +33,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class... Args>
     internal::values_t<Args...> values(Args... args) {
         return {{std::forward<Args>(args)...}};
diff --git a/dev/xdestroy_handling.h b/dev/xdestroy_handling.h
index 2d05fd74..eb7b5cb7 100644
--- a/dev/xdestroy_handling.h
+++ b/dev/xdestroy_handling.h
@@ -9,7 +9,8 @@
 
 #include "functional/cxx_type_traits_polyfill.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     using xdestroy_fn_t = void (*)(void*);
     using null_xdestroy_t = std::integral_constant<xdestroy_fn_t, nullptr>;
@@ -174,7 +175,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     /**
diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
index cda583de..1d4eb901 100644
--- a/include/sqlite_orm/sqlite_orm.h
+++ b/include/sqlite_orm/sqlite_orm.h
@@ -1898,7 +1898,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     template<class T>
     concept orm_names_type = requires { typename T::type; };
@@ -2010,7 +2011,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     /** @short Specifies that a type is a reference of a concrete table, especially of a derived class.
      *
@@ -2022,7 +2024,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #endif
 }
 
-_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.
      */
@@ -2082,7 +2085,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>;
@@ -2289,7 +2293,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.
@@ -2580,7 +2585,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.
      *  
@@ -2897,7 +2903,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #include <type_traits>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** @short Enables classifying sqlite error codes.
 
@@ -2939,7 +2946,8 @@ namespace std {
     struct is_error_code_enum<::sqlite_orm::orm_error_code> : true_type {};
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     class orm_error_category : public std::error_category {
       public:
@@ -3023,7 +3031,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename... T>
-    std::string get_error_message(sqlite3 * db, T && ... args) {
+    std::string get_error_message(sqlite3* db, T&&... args) {
         std::ostringstream stream;
         using unpack = int[];
         (void)unpack{0, (stream << args, 0)...};
@@ -3032,7 +3040,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename... T>
-    [[noreturn]] void throw_error(sqlite3 * db, T && ... args) {
+    [[noreturn]] void throw_error(sqlite3* db, T&&... args) {
         throw std::system_error{sqlite_errc(sqlite3_errcode(db)), get_error_message(db, std::forward<T>(args)...)};
     }
 
@@ -3040,7 +3048,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
         return {sqlite_errc(ev)};
     }
 
-    inline std::system_error sqlite_to_system_error(sqlite3 * db) {
+    inline std::system_error sqlite_to_system_error(sqlite3* db) {
         return {sqlite_errc(sqlite3_errcode(db)), sqlite3_errmsg(db)};
     }
 
@@ -3048,11 +3056,11 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
         throw sqlite_to_system_error(ev);
     }
 
-    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3 * db) {
+    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3* db) {
         throw sqlite_to_system_error(db);
     }
 
-    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3_stmt * stmt) {
+    [[noreturn]] inline void throw_translated_sqlite_error(sqlite3_stmt* stmt) {
         throw sqlite_to_system_error(sqlite3_db_handle(stmt));
     }
 }
@@ -3077,7 +3085,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #include <memory>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Specialization for optional type (std::shared_ptr / std::unique_ptr).
@@ -3104,7 +3113,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     };
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  This class transforms a C++ type to a sqlite type name (int -> INTEGER, ...)
@@ -3757,7 +3767,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) {
@@ -3914,7 +3925,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 // #include "type_traits.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Is used to print members mapped to objects in storage_t::dump member function.
@@ -4113,7 +4125,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::rowid_t rowid() {
         return {};
     }
@@ -4415,7 +4428,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Public interface for || concatenation operator. Example: `select(conc(&User::name, "@gmail.com"));` => SELECT
      * name || '@gmail.com' FROM users
@@ -4597,7 +4611,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
@@ -4656,7 +4671,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))
@@ -4844,7 +4860,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Public interface for syntax sugar for columns. Example: `where(c(&User::id) == 5)` or
      * `storage.update(set(c(&User::name) = "Dua Lipa"));
@@ -5676,7 +5693,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>());`
@@ -6090,8 +6108,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();
     }
@@ -6167,7 +6185,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 {};
@@ -6785,7 +6804,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     using int64 = sqlite_int64;
     using uint64 = sqlite_uint64;
@@ -7828,12 +7848,12 @@ _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)...)};
     }
 
@@ -7841,15 +7861,14 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  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))};
     }
 
@@ -8044,10 +8063,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)...}};
     }
 
@@ -8056,10 +8073,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)...}};
     }
 
@@ -8338,7 +8353,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.
@@ -8393,7 +8409,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 // #include "functional/cxx_type_traits_polyfill.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  This is class that tells `sqlite_orm` that type is nullable. Nullable types
@@ -8557,14 +8574,14 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Factory function for a column definition from a member object pointer of the object to be mapped.
      */
     template<class M, class... Op, internal::satisfies<std::is_member_object_pointer, M> = true>
-    internal::column_t<M, internal::empty_setter, Op...> make_column(std::string name,
-                                                                     M memberPointer,
-                                                                     Op... constraints) {
+    internal::column_t<M, internal::empty_setter, Op...>
+    make_column(std::string name, M memberPointer, Op... constraints) {
         static_assert(polyfill::conjunction_v<internal::is_column_constraint<Op>...>, "Incorrect constraints pack");
 
         // attention: do not use `std::make_tuple()` for constructing the tuple member `[[no_unique_address]] column_constraints::constraints`,
@@ -9018,7 +9035,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
     template<class T>
     internal::as_optional_t<T> as_optional(T value) {
@@ -9297,9 +9315,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  @note The use of RECURSIVE does not force common table expressions to be recursive.
      */
     template<class Compound, class... CTEs, internal::satisfies<internal::is_compound_operator, Compound> = true>
-    internal::with_t<internal::select_t<Compound>, CTEs...> with_recursive(
-        internal::common_table_expressions<CTEs...> ctes,
-        Compound sel) {
+    internal::with_t<internal::select_t<Compound>, CTEs...>
+    with_recursive(internal::common_table_expressions<CTEs...> ctes, Compound sel) {
         return {true, std::move(ctes), sqlite_orm::select(std::move(sel))};
     }
 
@@ -9443,7 +9460,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 // #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.
@@ -9472,7 +9490,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 // #include "functional/cxx_type_traits_polyfill.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     using xdestroy_fn_t = void (*)(void*);
     using null_xdestroy_t = std::integral_constant<xdestroy_fn_t, nullptr>;
@@ -9637,7 +9656,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
 #ifdef SQLITE_ORM_CPP20_CONCEPTS_SUPPORTED
     /**
@@ -9743,7 +9763,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     inline namespace literals {
         template<internal::cstring_literal tag>
@@ -9906,7 +9927,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #endif
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  Wrap a pointer, its type and its deleter function for binding it to a statement.
      *  
@@ -9915,7 +9937,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<class T, class P, class D>
-    auto bind_pointer(P * p, D d) noexcept -> pointer_binding<P, T, D> {
+    auto bind_pointer(P* p, D d) noexcept -> pointer_binding<P, T, D> {
         return {p, std::move(d)};
     }
 
@@ -9925,27 +9947,25 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<typename B>
-    auto bind_pointer(typename B::qualified_type * p, typename B::deleter_type d = {}) noexcept -> B {
+    auto bind_pointer(typename B::qualified_type* p, typename B::deleter_type d = {}) noexcept -> B {
         return B{p, std::move(d)};
     }
 
     template<class T, class P, class D>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D> bindable_pointer(
-        P * p,
-        D d) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D>
+    bindable_pointer(P* p, D d) noexcept {
         return bind_pointer<T>(p, std::move(d));
     }
 
     template<class T, class P, class D>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D> bindable_pointer(
-        std::unique_ptr<P, D> p) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] pointer_binding<P, T, D>
+    bindable_pointer(std::unique_ptr<P, D> p) noexcept {
         return bind_pointer<T>(p.release(), p.get_deleter());
     }
 
     template<typename B>
-    [[deprecated("Use the better named function `bind_pointer(...)`")]] B bindable_pointer(
-        typename B::qualified_type * p,
-        typename B::deleter_type d = {}) noexcept {
+    [[deprecated("Use the better named function `bind_pointer(...)`")]] B
+    bindable_pointer(typename B::qualified_type* p, typename B::deleter_type d = {}) noexcept {
         return bind_pointer<B>(p, std::move(d));
     }
 
@@ -9958,7 +9978,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  the deleter when the statement finishes.
      */
     template<orm_pointer_type auto tag, class P, class D>
-    auto bind_pointer(P * p, D d) noexcept -> pointer_binding<P, decltype(tag), D> {
+    auto bind_pointer(P* p, D d) noexcept -> pointer_binding<P, decltype(tag), D> {
         return {p, std::move(d)};
     }
 
@@ -9975,26 +9995,26 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  and sqlite assumes the object pointed to is valid throughout the lifetime of a statement.
      */
     template<class T, class P>
-    auto bind_pointer_statically(P * p) noexcept -> static_pointer_binding<P, T> {
+    auto bind_pointer_statically(P* p) noexcept -> static_pointer_binding<P, T> {
         return bind_pointer<T>(p, null_xdestroy_f);
     }
 
     template<typename B>
-    B bind_pointer_statically(typename B::qualified_type * p,
+    B bind_pointer_statically(typename B::qualified_type* p,
                               typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
         return bind_pointer<B>(p);
     }
 
     template<class T, class P>
     [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] static_pointer_binding<P, T>
-    statically_bindable_pointer(P * p) noexcept {
+    statically_bindable_pointer(P* p) noexcept {
         return bind_pointer<T>(p, null_xdestroy_f);
     }
 
     template<typename B>
-    [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] B statically_bindable_pointer(
-        typename B::qualified_type * p,
-        typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
+    [[deprecated("Use the better named function `bind_pointer_statically(...)`")]] B
+    statically_bindable_pointer(typename B::qualified_type* p,
+                                typename B::deleter_type* /*exposition*/ = nullptr) noexcept {
         return bind_pointer<B>(p);
     }
 
@@ -10006,7 +10026,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
      *  and sqlite assumes the object pointed to is valid throughout the lifetime of a statement.
      */
     template<orm_pointer_type auto tag, class P>
-    auto bind_pointer_statically(P * p) noexcept -> static_pointer_binding<P, decltype(tag)> {
+    auto bind_pointer_statically(P* p) noexcept -> static_pointer_binding<P, decltype(tag)> {
         return bind_pointer<tag>(p, null_xdestroy_f);
     }
 #endif
@@ -10021,7 +10041,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 }
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Helper class used for binding fields to sqlite3 statements.
@@ -10943,7 +10964,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     /** @short Specifies that a type is a function signature (i.e. a function in the C++ type system).
      */
@@ -11375,7 +11397,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /** @short Call a user-defined function.
      *  
      *  Note: Currently the number of call arguments is checked and whether the types of pointer values match,
@@ -11448,7 +11471,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::current_time_t current_time() {
         return {};
     }
@@ -11789,7 +11813,8 @@ namespace sqlite_orm {
 #include <ostream>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     enum class sync_schema_result {
 
@@ -11853,7 +11878,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #include <string>  //  std::string
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     struct table_info {
         int cid = 0;
@@ -12051,7 +12077,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      * Use this function to specify indexed column inside `make_index` function call.
      * Example: make_index("index_name", indexed_column(&User::id).asc())
@@ -12093,7 +12120,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class T, class... Cols>
     internal::index_t<T, decltype(internal::make_indexed_column(std::declval<Cols>()))...> make_index(std::string name,
                                                                                                       Cols... cols) {
@@ -12521,7 +12549,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 #if SQLITE_VERSION_NUMBER >= 3009000
     template<class... Cs, class T = typename std::tuple_element_t<0, std::tuple<Cs...>>::object_type>
     internal::using_fts5_t<T, Cs...> using_fts5(Cs... columns) {
@@ -12714,7 +12743,8 @@ namespace sqlite_orm {
 #undef DELETE
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Caps case because of:
@@ -12824,7 +12854,8 @@ namespace sqlite_orm {
 
 // #include "type_traits.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Helper for casting values originating from SQL to C++ typed values, usually from rows of a result set.
@@ -12914,7 +12945,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class R>
     int extract_single_value(void* data, int argc, char** argv, char**) {
         auto& res = *(R*)data;
@@ -13371,7 +13403,8 @@ namespace sqlite_orm {
 #include <type_traits>  // std::integral_constant
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /**
      *  Guard class which finalizes `sqlite3_stmt` in dtor
@@ -13485,7 +13518,8 @@ namespace sqlite_orm {
 
 // #include "error_code.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** 
      *  Escape the provided character in the given string by doubling it.
@@ -13875,7 +13909,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     template<class... Args>
     internal::values_t<Args...> values(Args... args) {
         return {{std::forward<Args>(args)...}};
@@ -13948,7 +13983,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.
@@ -14171,7 +14207,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)
@@ -14500,7 +14537,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::insert_constraint or_rollback() {
         return {internal::conflict_action::rollback};
     }
@@ -14928,7 +14966,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     template<orm_refers_to_table auto mapped,
              class R = std::vector<internal::mapped_type_proxy_t<decltype(mapped)>>,
              class... Args>
-    auto get_all(Args && ... conditions) {
+    auto get_all(Args&&... conditions) {
         return get_all<internal::auto_decay_table_ref_t<mapped>, R>(std::forward<Args>(conditions)...);
     }
 #endif
@@ -14998,7 +15036,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     template<orm_table_reference auto table,
              class R = std::vector<internal::auto_decay_table_ref_t<table>>,
              class... Args>
-    auto get_all_optional(Args && ... conditions) {
+    auto get_all_optional(Args&&... conditions) {
         return get_all_optional<internal::auto_decay_table_ref_t<table>, R>(std::forward<Args>(conditions)...);
     }
 #endif
@@ -15026,7 +15064,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)};
@@ -15064,7 +15103,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),
@@ -15087,7 +15127,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #include <utility>
 #endif
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     namespace internal {
 
         template<class T, class X>
@@ -17137,7 +17178,8 @@ namespace sqlite_orm {
 
 // #include "row_extractor.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
 
     /** @short Wrapper around a dynamically typed value object.
      */
@@ -18713,7 +18755,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     inline internal::rank_t rank() {
         return {};
     }
@@ -19429,7 +19472,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /**
      *  NEW.expression function used within TRIGGER expressions
      */
@@ -23874,7 +23918,8 @@ namespace sqlite_orm {
     }
 }
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /*
      *  Factory function for a storage, from a database file and a bunch of database object definitions.
      */
@@ -24054,7 +24099,8 @@ namespace sqlite_orm {
 
 // #include "alias.h"
 
-_EXPORT_SQLITE_ORM namespace sqlite_orm {
+_EXPORT_SQLITE_ORM
+namespace sqlite_orm {
     /** 
      *  SQLite's "schema table" that stores the schema for a database.
      *  
@@ -24105,7 +24151,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 // #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;
@@ -24570,10 +24617,11 @@ namespace sqlite_orm {
 
 // #include "expression_object_type.h"
 
-_EXPORT_SQLITE_ORM 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) {
+    auto& get(internal::prepared_statement_t<internal::insert_range_t<It, L, O>>& statement) {
         return std::get<N>(statement.expression.range);
     }
 
@@ -24583,7 +24631,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class It, class L, class O>
-    auto& get(internal::prepared_statement_t<internal::replace_range_t<It, L, O>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::replace_range_t<It, L, O>>& statement) {
         return std::get<N>(statement.expression.range);
     }
 
@@ -24593,7 +24641,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -24603,7 +24651,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_pointer_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_pointer_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -24614,7 +24662,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::get_optional_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::get_optional_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -24625,7 +24673,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 #endif  // SQLITE_ORM_OPTIONAL_SUPPORTED
 
     template<int N, class T, class... Ids>
-    auto& get(internal::prepared_statement_t<internal::remove_t<T, Ids...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::remove_t<T, Ids...>>& statement) {
         return internal::get_ref(std::get<N>(statement.expression.ids));
     }
 
@@ -24635,7 +24683,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::update_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::update_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for update statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -24647,7 +24695,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T, class... Cols>
-    auto& get(internal::prepared_statement_t<internal::insert_explicit<T, Cols...>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::insert_explicit<T, Cols...>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for insert statement");
         return internal::get_ref(statement.expression.obj);
     }
@@ -24659,7 +24707,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::replace_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::replace_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for replace statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -24671,7 +24719,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<internal::insert_t<T>> & statement) {
+    auto& get(internal::prepared_statement_t<internal::insert_t<T>>& statement) {
         static_assert(N == 0, "get<> works only with 0 argument for insert statement");
         return internal::get_ref(statement.expression.object);
     }
@@ -24708,7 +24756,7 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
     }
 
     template<int N, class T>
-    auto& get(internal::prepared_statement_t<T> & statement) {
+    auto& get(internal::prepared_statement_t<T>& statement) {
         using statement_type = std::remove_reference_t<decltype(statement)>;
         using expression_type = internal::expression_type_t<statement_type>;
         using node_tuple = internal::node_tuple_t<expression_type>;
@@ -24756,7 +24804,8 @@ _EXPORT_SQLITE_ORM namespace sqlite_orm {
 
 #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;
@@ -24778,12 +24827,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);
     }
 
@@ -24795,14 +24844,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
@@ -24826,7 +24875,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));
     }
 
@@ -24837,20 +24886,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