Generate .lib files when building shared on Windows; Bumped to version 0.4.0

.github/workflows/linux-cxx20-conan.yaml

@@ -2,6 +2,7 @@ name: linux-cxx20-conan
 
 on: [push, pull_request]
 
+
 jobs:
   linux:
     strategy:
@@ -35,6 +36,9 @@ jobs:
             compiler-version: 12
             link: "shared" 
     name: "${{ github.job }} (${{ matrix.compiler }}-${{ matrix.compiler-version }}-${{ matrix.link }})"
+    concurrency:
+      group: ci-${{ github.ref }}-${{ github.job }}-${{ matrix.compiler }}-${{ matrix.compiler-version }}-${{ matrix.link }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/linux-cxx20-vcpkg.yaml

@@ -2,6 +2,7 @@ name: linux-cxx20-vcpkg
 
 on: [push, pull_request]
 
+
 env: 
     VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
@@ -60,6 +61,9 @@ jobs:
             compiler-version: 14
             db: mysql
     name: "${{ github.job }} (${{ matrix.compiler }}-${{ matrix.compiler-version }}-${{ matrix.db }})"
+    concurrency:
+      group: ci-${{ github.ref }}-${{ github.job }}-${{ matrix.compiler }}-${{ matrix.compiler-version }}-${{ matrix.db }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/macos-cxx20-conan.yaml

@@ -2,6 +2,7 @@ name: macos-cxx20-conan
 
 on: [push, pull_request]
 
+
 jobs:
   macos-clang:
     strategy:
@@ -17,6 +18,9 @@ jobs:
           - os: "macos-13"
             link: "shared" 
     name: "${{ github.job }} (${{ matrix.os }}-${{ matrix.link }})"
+    concurrency:
+      group: ci-${{ github.ref }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.link }}
+      cancel-in-progress: true
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

.github/workflows/macos-cxx20-vcpkg.yaml

@@ -2,6 +2,7 @@ name: macos-cxx20-vcpkg
 
 on: [push, pull_request]
 
+
 env: 
     VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
@@ -24,6 +25,9 @@ jobs:
           - os: "macos-13"
             db: mysql 
     name: "${{ github.job }} (${{ matrix.os }}-${{ matrix.db }})"
+    concurrency:
+      group: ci-${{ github.ref }}-${{ github.job }}-${{ matrix.os }}-${{ matrix.db }}
+      cancel-in-progress: true
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

.github/workflows/windows-cxx20-vcpkg.yaml

@@ -14,7 +14,11 @@ jobs:
           - db: postgres
           - db: sqlite
           - db: mysql 
+          - db: headers 
     name: "(windows-${{ matrix.db }})"
+    concurrency:
+      group: ci-${{ github.ref }}-windows-${{ matrix.db }}
+      cancel-in-progress: true
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -30,21 +34,27 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
       - uses: ilammy/msvc-dev-cmd@v1
       - uses: lukka/run-vcpkg@v11
+      - name: Compile
+        if: matrix.db == 'headers' 
+        run: |
+          cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DSQLGEN_CHECK_HEADERS=ON 
+          cmake --build build --config Release -j4 
       - name: Compile
         if: matrix.db == 'postgres' 
         run: |
-          cmake -S . -B build -G Ninja -DCMAKE_CXX_STANDARD=20 -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_SQLITE3=OFF -DSQLGEN_BUILD_DRY_TESTS_ONLY=ON 
+          cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_SQLITE3=OFF -DSQLGEN_BUILD_DRY_TESTS_ONLY=ON -DBUILD_SHARED_LIBS=ON -DVCPKG_TARGET_TRIPLET=x64-windows-release
           cmake --build build --config Release -j4 
       - name: Compile
         if: matrix.db == 'sqlite' 
         run: |
-          cmake -S . -B build -G Ninja -DCMAKE_CXX_STANDARD=20 -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_POSTGRES=OFF -DSQLGEN_CHECK_HEADERS=ON
+          cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_POSTGRES=OFF -DBUILD_SHARED_LIBS=ON -DVCPKG_TARGET_TRIPLET=x64-windows-release
           cmake --build build --config Release -j4 
       - name: Compile
         if: matrix.db == 'mysql' 
         run: |
-          cmake -S . -B build -G Ninja -DCMAKE_CXX_STANDARD=20 -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_MYSQL=ON -DSQLGEN_POSTGRES=OFF -DSQLGEN_SQLITE3=OFF -DSQLGEN_BUILD_DRY_TESTS_ONLY=ON
+          cmake -S . -B build -DCMAKE_CXX_STANDARD=20 -DCMAKE_BUILD_TYPE=Release -DSQLGEN_BUILD_TESTS=ON -DSQLGEN_MYSQL=ON -DSQLGEN_POSTGRES=OFF -DSQLGEN_SQLITE3=OFF -DSQLGEN_BUILD_DRY_TESTS_ONLY=ON -DBUILD_SHARED_LIBS=ON -DVCPKG_TARGET_TRIPLET=x64-windows-release
           cmake --build build --config Release -j4 
       - name: Run tests
+        if: matrix.db != 'headers' 
         run: |
           ctest --test-dir build --output-on-failure

.gitignore

@@ -31,6 +31,7 @@
 *.out
 *.app
 
+.cache/
 build/
 vcpkg_installed/
 CMakeUserPresets.json

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.23)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 option(SQLGEN_BUILD_SHARED "Build shared library" ${BUILD_SHARED_LIBS})
 
 option(SQLGEN_MYSQL "Enable MySQL support" OFF) 
@@ -43,7 +45,7 @@ if (SQLGEN_USE_VCPKG)
     set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
 endif ()
 
-project(sqlgen VERSION 0.3.0 LANGUAGES CXX)
+project(sqlgen VERSION 0.4.0 LANGUAGES CXX)
 
 if (SQLGEN_BUILD_SHARED)
     add_library(sqlgen SHARED)
@@ -52,10 +54,30 @@ else()
     add_library(sqlgen STATIC)
 endif()
 
+add_library(sqlgen::sqlgen ALIAS sqlgen)
+
 if (MSVC)
-    target_compile_options(sqlgen PRIVATE $<$<CONFIG:Debug>:-Wall>)
+    target_compile_options(sqlgen PRIVATE 
+        $<$<CONFIG:Debug>:
+            -Wall
+        >
+        $<$<CONFIG:Release>:
+            -DNDEBUG
+        >
+    )
 else()
-    target_compile_options(sqlgen PRIVATE $<$<CONFIG:Debug>:-Wall -Wextra>)
+    target_compile_options(sqlgen PRIVATE
+        $<$<CONFIG:Debug>:
+            -Wall -Wextra -Wpedantic -Wshadow -Wconversion
+        >
+        $<$<CONFIG:Release>:
+            -DNDEBUG
+        >
+    )
+endif()
+
+if (SQLGEN_BUILD_SHARED)
+    target_compile_definitions(sqlgen PUBLIC SQLGEN_BUILD_SHARED)
 endif()
 
 set(SQLGEN_SOURCES
@@ -114,9 +136,11 @@ set_target_properties(sqlgen PROPERTIES LINKER_LANGUAGE CXX)
 target_sources(sqlgen PRIVATE ${SQLGEN_SOURCES})
 
 if (SQLGEN_BUILD_TESTS)
+    add_library(sqlgen_tests_crt INTERFACE)
+    target_link_libraries(sqlgen_tests_crt INTERFACE sqlgen GTest::gtest_main)
+
     enable_testing()
     find_package(GTest CONFIG REQUIRED)
-    set(SQLGEN_GTEST_LIB sqlgen GTest::gtest_main)
     add_subdirectory(tests)
 endif ()
 

include/sqlgen.hpp

@@ -5,7 +5,6 @@
 #include "sqlgen/Flatten.hpp"
 #include "sqlgen/ForeignKey.hpp"
 #include "sqlgen/Iterator.hpp"
-#include "sqlgen/IteratorBase.hpp"
 #include "sqlgen/JSON.hpp"
 #include "sqlgen/Literal.hpp"
 #include "sqlgen/Pattern.hpp"
@@ -44,6 +43,7 @@
 #include "sqlgen/read.hpp"
 #include "sqlgen/rollback.hpp"
 #include "sqlgen/select_from.hpp"
+#include "sqlgen/sqlgen_api.hpp"
 #include "sqlgen/to.hpp"
 #include "sqlgen/update.hpp"
 #include "sqlgen/where.hpp"

include/sqlgen/Iterator.hpp

@@ -5,7 +5,6 @@
 #include <memory>
 #include <ranges>
 
-#include "IteratorBase.hpp"
 #include "Ref.hpp"
 #include "Result.hpp"
 #include "internal/batch_size.hpp"
@@ -15,23 +14,19 @@
 namespace sqlgen {
 
 /// An input_iterator that returns the underlying type.
-template <class T>
+template <class T, class UnderlyingIteratorT>
 class Iterator {
  public:
   using difference_type = std::ptrdiff_t;
   using value_type = Result<T>;
 
   struct End {
-    bool operator==(const Iterator<T>& _it) const noexcept {
-      return _it == *this;
-    }
+    bool operator==(const Iterator& _it) const noexcept { return _it == *this; }
 
-    bool operator!=(const Iterator<T>& _it) const noexcept {
-      return _it != *this;
-    }
+    bool operator!=(const Iterator& _it) const noexcept { return _it != *this; }
   };
 
-  Iterator(const Ref<IteratorBase>& _it)
+  Iterator(const Ref<UnderlyingIteratorT>& _it)
       : current_batch_(get_next_batch(_it)), it_(_it), ix_(0) {}
 
   ~Iterator() = default;
@@ -46,7 +41,7 @@ class Iterator {
 
   bool operator!=(const End& _end) const noexcept { return !(*this == _end); }
 
-  Iterator<T>& operator++() noexcept {
+  Iterator& operator++() noexcept {
     ++ix_;
     if (ix_ >= current_batch_->size() && !it_->end()) {
       current_batch_ = get_next_batch(it_);
@@ -59,7 +54,7 @@ class Iterator {
 
  private:
   static Ref<std::vector<Result<T>>> get_next_batch(
-      const Ref<IteratorBase>& _it) noexcept {
+      const Ref<UnderlyingIteratorT>& _it) noexcept {
     using namespace std::ranges::views;
     return _it->next(SQLGEN_BATCH_SIZE)
         .transform([](auto str_vec) {
@@ -74,7 +69,7 @@ class Iterator {
   Ref<std::vector<Result<T>>> current_batch_;
 
   /// The underlying database iterator.
-  Ref<IteratorBase> it_;
+  Ref<UnderlyingIteratorT> it_;
 
   /// The current index in the current batch.
   size_t ix_;

include/sqlgen/Range.hpp

@@ -4,7 +4,6 @@
 #include <memory>
 #include <ranges>
 
-#include "Iterator.hpp"
 #include "Result.hpp"
 
 namespace sqlgen {

include/sqlgen/Session.hpp

@@ -6,8 +6,8 @@
 #include <optional>
 #include <vector>
 
-#include "IteratorBase.hpp"
 #include "Ref.hpp"
+#include "Result.hpp"
 #include "dynamic/Insert.hpp"
 #include "dynamic/SelectFrom.hpp"
 #include "dynamic/Statement.hpp"

include/sqlgen/internal/iterator_t.hpp

@@ -3,20 +3,29 @@
 
 #include <type_traits>
 
-#include "../Iterator.hpp"
+#include "../Ref.hpp"
+#include "../Result.hpp"
 
 namespace sqlgen::internal {
 
 template <class ValueType, class ConnType>
 struct IteratorType;
 
-/// Most database connectors can just use the standard iterator type, but
-/// sometimes we need exception, in which case this template can be overridden.
 template <class ValueType, class ConnType>
-struct IteratorType {
-  using Type = Iterator<ValueType>;
+struct IteratorType<ValueType, Ref<ConnType>> {
+  using Type =
+      typename IteratorType<ValueType, std::remove_cvref_t<ConnType>>::Type;
 };
 
+template <class ValueType, class ConnType>
+struct IteratorType<ValueType, Result<ConnType>> {
+  using Type =
+      typename IteratorType<ValueType, std::remove_cvref_t<ConnType>>::Type;
+};
+
+// The specific iterator is implemented by each database in (database
+// name)/Connection.hpp
+
 template <class T, class ConnType>
 using iterator_t = typename IteratorType<std::remove_cvref_t<T>,
                                          std::remove_cvref_t<ConnType>>::Type;

include/sqlgen/internal/strings/strings.hpp

@@ -4,28 +4,33 @@
 #include <string>
 #include <vector>
 
+#include "../../sqlgen_api.hpp"
+
 namespace sqlgen::internal::strings {
 
-char to_lower(const char ch);
+SQLGEN_API char to_lower(const char ch);
 
-std::string to_lower(const std::string& _str);
+SQLGEN_API std::string to_lower(const std::string& _str);
 
-char to_upper(const char ch);
+SQLGEN_API char to_upper(const char ch);
 
-std::string to_upper(const std::string& _str);
+SQLGEN_API std::string to_upper(const std::string& _str);
 
-std::string join(const std::string& _delimiter,
-                 const std::vector<std::string>& _strings);
+SQLGEN_API std::string join(const std::string& _delimiter,
+                            const std::vector<std::string>& _strings);
 
-std::string replace_all(const std::string& _str, const std::string& _from,
-                        const std::string& _to);
+SQLGEN_API std::string replace_all(const std::string& _str,
+                                   const std::string& _from,
+                                   const std::string& _to);
 
-std::vector<std::string> split(const std::string& _str,
-                               const std::string& _delimiter);
+SQLGEN_API std::vector<std::string> split(const std::string& _str,
+                                          const std::string& _delimiter);
 
-std::string ltrim(const std::string& _str, const std::string& _chars = " ");
+SQLGEN_API std::string ltrim(const std::string& _str,
+                             const std::string& _chars = " ");
 
-std::string rtrim(const std::string& _str, const std::string& _chars = " ");
+SQLGEN_API std::string rtrim(const std::string& _str,
+                             const std::string& _chars = " ");
 
 inline std::string trim(const std::string& _str,
                         const std::string& _chars = " ") {