fnc12 · fnc12 · Jul 16, 2024 · Jul 17, 2024 · Jul 17, 2024 · Jul 17, 2024
diff --git a/.clang-format b/.clang-format
@@ -118,7 +118,7 @@ SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Cpp11
-AttributeMacros: [SQLITE_ORM_CPP_LIKELY, SQLITE_ORM_CPP_UNLIKELY]
+AttributeMacros: [SQLITE_ORM_CPP_LIKELY, SQLITE_ORM_CPP_UNLIKELY, SQLITE_ORM_EXPORT]
 StatementMacros: 
   - __pragma
   - _Pragma

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -74,6 +74,19 @@
         "type_traits": "cpp",
         "utility": "cpp",
         "__config": "cpp",
-        "any": "cpp"
+        "any": "cpp",
+        "__threading_support": "cpp",
+        "condition_variable": "cpp",
+        "complex": "cpp",
+        "thread": "cpp",
+        "future": "cpp",
+        "fstream": "cpp",
+        "execution": "cpp",
+        "iostream": "cpp",
+        "numbers": "cpp",
+        "queue": "cpp",
+        "semaphore": "cpp",
+        "stack": "cpp",
+        "unordered_set": "cpp"
     }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,10 +11,14 @@ set(PACKAGE_VERSION ${sqlite_orm_VERSION})
 project("sqlite_orm" VERSION ${PACKAGE_VERSION})
 
 # Handling C++ standard version to use
+option(SQLITE_ORM_ENABLE_CXX_23 "Enable C++ 23" OFF)
 option(SQLITE_ORM_ENABLE_CXX_20 "Enable C++ 20" OFF)
 option(SQLITE_ORM_ENABLE_CXX_17 "Enable C++ 17" OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if(SQLITE_ORM_ENABLE_CXX_20)
+if(SQLITE_ORM_ENABLE_CXX_23)
+    set(CMAKE_CXX_STANDARD 23)
+    message(STATUS "SQLITE_ORM: Build with C++23 features")
+elseif(SQLITE_ORM_ENABLE_CXX_20)
     set(CMAKE_CXX_STANDARD 20)
     message(STATUS "SQLITE_ORM: Build with C++20 features")
 elseif(SQLITE_ORM_ENABLE_CXX_17)
@@ -51,6 +55,17 @@ target_sources(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/incl
 
 target_include_directories(sqlite_orm INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    target_compile_options(sqlite_orm INTERFACE
+        -Wreorder
+        -Werror=reorder
+    )
+elseif(MSVC)
+    target_compile_options(sqlite_orm INTERFACE
+        /we5038
+    )
+endif()
+
 include(ucm)
 
 if (MSVC)

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ SQLite ORM light header only library for modern C++. Please read the license pre
 * **No raw string queries**
 * **Intuitive syntax**
 * **Comfortable interface - one code line per single query**
-* **Built with modern C++14/C++17/C++20 features (no macros and external scripts)**
+* **Built with modern C++17 functionality (or higher) - no macros and external scripts**
 * **CRUD support**
 * **Pure select query support**
 * **Prepared statements support**
@@ -801,7 +801,7 @@ If you want to use the lib directly with Make or something else, just set the in
 
 # Requirements
 
-* C++14 compatible compiler (not C++11 cause of templated lambdas in the lib).
+* C++17 compatible compiler.
 * Sqlite3 installed on your system and in the path, so cmake can find it (or linked to you project if you don't use cmake)
 
 # Video from conference

diff --git a/appveyor.yml b/appveyor.yml
@@ -20,27 +20,26 @@ configuration:
 environment:
   appveyor_yml_disable_ps_linux: true
   matrix:
-    - job_name: clang, C++14
-      appveyor_build_worker_image: Ubuntu
-      CC: clang
-      CXX: clang++
-      SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_14=ON"
+    - job_name: Visual Studio 2022, x64, C++23
+      appveyor_build_worker_image: Visual Studio 2022
+      platform: x64
+      SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_23=ON"
+
+    - job_name: clang, C++23
+      appveyor_build_worker_image: Ubuntu2204
+      CC: clang-18
+      CXX: clang++-18
+      SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_23=ON"
       cmake_build_parallel: ""
 
-    - job_name: gcc, C++14
-      appveyor_build_worker_image: Ubuntu
+    - job_name: gcc, C++23
+      appveyor_build_worker_image: Ubuntu2204
       CC: gcc
       CXX: g++
-      SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_14=ON"
+      SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_23=ON"
       # gcc was stuck with a parallel build
       cmake_build_parallel: ""
 
-    # Representative for C++14
-    - job_name: Visual Studio 2017, x64, C++14
-      appveyor_build_worker_image: Visual Studio 2017
-      platform: x64
-      SQLITE_ORM_CXX_STANDARD: ""
-
     - job_name: clang, C++17
       appveyor_build_worker_image: Ubuntu
       CC: clang
@@ -72,8 +71,9 @@ environment:
       SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON"
       cmake_build_parallel: ""
 
-    - job_name: Visual Studio 2022, x64, C++17
-      appveyor_build_worker_image: Visual Studio 2022
+    # Representative for C++17
+    - job_name: Visual Studio 2017, x64, C++17
+      appveyor_build_worker_image: Visual Studio 2017
       platform: x64
       SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
 
@@ -108,7 +108,7 @@ for:
   install:
     - |-
       cd C:\Tools\vcpkg
-      git fetch --tags && git checkout 2025.01.13
+      git fetch --tags && git checkout 2025.03.19
       cd %APPVEYOR_BUILD_FOLDER%
       C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
       C:\Tools\vcpkg\vcpkg integrate install
@@ -132,6 +132,7 @@ for:
   matrix:
     only:
       - appveyor_build_worker_image: Ubuntu
+      - appveyor_build_worker_image: Ubuntu2204
   init:
     - |-
       echo $appveyor_build_worker_image
@@ -141,7 +142,7 @@ for:
   install:
     - |-
       pushd $HOME/vcpkg
-      git fetch --tags && git checkout 2025.01.13
+      git fetch --tags && git checkout 2025.03.19
       popd
       $HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
@@ -169,7 +170,7 @@ for:
   # using custom vcpkg triplets for building and linking dynamic dependent libraries
   install:
     - |-
-      git clone --depth 1 --branch 2025.01.13 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
+      git clone --depth 1 --branch 2025.03.19 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
       $HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
       vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets

diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -6,13 +6,13 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
         FetchContent_Declare(
             Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v3.2.1
+            GIT_TAG v3.8.0
         )
     else()
         FetchContent_Declare(
             Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v3.2.1
+            GIT_TAG v3.8.0
             # prefer find_package() over building from source
             FIND_PACKAGE_ARGS 3 CONFIG
         )

diff --git a/dev/alias.h b/dev/alias.h
@@ -1,18 +1,21 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <type_traits>  //  std::enable_if, std::is_same
 #include <utility>  //  std::make_index_sequence, std::move
 #include <string>  //  std::string
 #include <sstream>  //  std::stringstream
 #if (SQLITE_VERSION_NUMBER >= 3008003) && defined(SQLITE_ORM_WITH_CTE)
 #include <array>
 #endif
+#endif
 
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/mpl/conditional.h"
 #include "functional/cstring_literal.h"
 #include "type_traits.h"
 #include "alias_traits.h"
+#include "field_of.h"
 #include "table_type_of.h"
 #include "tags.h"
 #include "column_pointer.h"
@@ -185,7 +188,9 @@ namespace sqlite_orm {
         inline constexpr bool is_builtin_numeric_column_alias_v<column_alias<C...>> = ((C >= '0' && C <= '9') && ...);
 #endif
     }
+}
 
+SQLITE_ORM_EXPORT namespace sqlite_orm {
     /**
      *  Using a column pointer, create a column reference to an aliased table column.
      *  
@@ -247,7 +252,7 @@ namespace sqlite_orm {
         requires (!orm_cte_moniker<internal::auto_type_t<als>>)
     constexpr auto alias_column(C field) {
         using namespace ::sqlite_orm::internal;
-        using A = decltype(als);
+        using A = std::remove_const_t<decltype(als)>;
         using aliased_type = type_t<A>;
         static_assert(is_field_of_v<C, aliased_type>, "Column must be from aliased table");
 
@@ -343,7 +348,7 @@ namespace sqlite_orm {
      */
     template<orm_column_alias auto als, class E>
     auto as(E expression) {
-        return internal::as_t<decltype(als), E>{std::move(expression)};
+        return internal::as_t<std::remove_const_t<decltype(als)>, E>{std::move(expression)};
     }
 
     /**
@@ -375,7 +380,7 @@ namespace sqlite_orm {
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
     template<orm_column_alias auto als>
     auto get() {
-        return internal::alias_holder<decltype(als)>{};
+        return internal::alias_holder<std::remove_const_t<decltype(als)>>{};
     }
 #endif
 

diff --git a/dev/alias_traits.h b/dev/alias_traits.h
@@ -1,20 +1,24 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <type_traits>  //  std::is_base_of, std::is_same
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
 #include <concepts>
 #endif
+#endif
 
 #include "functional/cxx_type_traits_polyfill.h"
 #include "type_traits.h"
 #include "table_reference.h"
 
-namespace sqlite_orm {
+SQLITE_ORM_EXPORT namespace sqlite_orm {
 
     /** @short Base class for a custom table alias, column alias or expression alias.
      */
     struct alias_tag {};
+}
 
+namespace sqlite_orm {
     namespace internal {
 
         template<class A>
@@ -65,7 +69,9 @@ namespace sqlite_orm {
         template<class A>
         using is_cte_moniker = polyfill::bool_constant<is_cte_moniker_v<A>>;
     }
+}
 
+SQLITE_ORM_EXPORT 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,7 @@
 
 #include "row_extractor.h"
 
-namespace sqlite_orm {
+SQLITE_ORM_EXPORT namespace sqlite_orm {
 
     /** @short Wrapper around a dynamically typed value object.
      */
@@ -98,9 +98,11 @@ namespace sqlite_orm {
                 return &other.container == &this->container && other.index == this->index;
             }
 
+#ifndef SQLITE_ORM_DEFAULT_COMPARISONS_SUPPORTED
             bool operator!=(const iterator& other) const {
                 return !(*this == other);
             }
+#endif
 
           private:
             const arg_values& container;

diff --git a/dev/arithmetic_tag.h b/dev/arithmetic_tag.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <type_traits>  // std::is_integral
+#endif
 
 #include "functional/mpl/conditional.h"
 
-namespace sqlite_orm {
+SQLITE_ORM_EXPORT namespace sqlite_orm {
 
     /**
      *  Helper classes used by statement_binder and row_extractor.

diff --git a/dev/ast/excluded.h b/dev/ast/excluded.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <utility>  //  std::move
+#endif
 
 namespace sqlite_orm {
     namespace internal {
@@ -12,7 +14,9 @@ namespace sqlite_orm {
             expression_type expression;
         };
     }
+}
 
+SQLITE_ORM_EXPORT 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
@@ -1,6 +1,8 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <utility>  //  std::move
+#endif
 
 #include "../tags.h"
 
@@ -17,7 +19,9 @@ namespace sqlite_orm {
             exists_t(expression_type expression_) : expression(std::move(expression_)) {}
         };
     }
+}
 
+SQLITE_ORM_EXPORT 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
@@ -1,8 +1,10 @@
 #pragma once
 
+#ifndef SQLITE_ORM_IMPORT_STD_MODULE
 #include <tuple>  //  std::tuple, std::make_tuple
 #include <type_traits>  //  std::true_type, std::false_type
 #include <utility>  //  std::forward, std::move
+#endif
 
 #include "../functional/cxx_type_traits_polyfill.h"
 
@@ -37,7 +39,9 @@ namespace sqlite_orm {
         using is_group_by = polyfill::disjunction<polyfill::is_specialization_of<T, group_by_t>,
                                                   polyfill::is_specialization_of<T, group_by_with_having>>;
     }
+}
 
+SQLITE_ORM_EXPORT 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
@@ -13,7 +13,9 @@ namespace sqlite_orm {
         template<class T>
         using is_into = polyfill::is_specialization_of<T, into_t>;
     }
+}
 
+SQLITE_ORM_EXPORT namespace sqlite_orm {
     template<class T>
     internal::into_t<T> into() {
         return {};