Fixci (#72)

Author: dantti

.github/copilot-instructions.md

@@ -0,0 +1,34 @@
+# Copilot Instructions
+
+## C++ coroutine lambdas — NEVER use captures
+
+Lambda-coroutines (`[](...) -> ACoroTerminator { co_await ...; }`) must have an
+**empty capture list `[]`**. The lambda's closure object is a temporary that is
+destroyed at the first `co_await` suspension point. Any captured variable then
+becomes a dangling reference inside the coroutine frame, causing undefined
+behaviour and hard-to-reproduce crashes.
+
+**Forbidden:**
+```cpp
+[this, finished, value]() -> ACoroTerminator {
+    auto result = co_await APool::exec(...);
+    // 'this', 'finished', 'value' are dangling here
+}();
+```
+
+**Required — pass everything as named parameters:**
+```cpp
+[](MyClass *self, std::shared_ptr<QObject> finished, int value) -> ACoroTerminator {
+    auto result = co_await APool::exec(...);  // parameters live in the coroutine frame
+}(this, finished, value);
+```
+
+Parameters are stored directly in the coroutine frame and remain valid for the
+entire lifetime of the coroutine.
+
+The same rule applies to named lambda variables that are called immediately or
+stored and invoked later — no captures of any kind on any lambda that contains
+a `co_await` or `co_yield` expression.
+
+Note: inner non-coroutine lambdas (e.g. `qScopeGuard([finished] {})`) are not
+coroutines and may capture normally.

.github/workflows/build.yml

@@ -18,18 +18,18 @@ jobs:
           - windows-latest
           - macos-latest
         config:
-          - qt_version: "6.4.2"
+          - qt_version: "6.5.3"
         include:
           # Two Linux builds: one against libmysqlclient (MySQL 8+) and one
           # against libmariadb (MariaDB Connector/C) to catch type-mismatch
           # errors like the my_bool*/bool* incompatibility.
           - os: ubuntu-latest
             config:
-              qt_version: "6.4.2"
+              qt_version: "6.5.3"
             mysql_lib: libmysqlclient-dev
           - os: ubuntu-latest
             config:
-              qt_version: "6.4.2"
+              qt_version: "6.11.0"
             mysql_lib: libmariadb-dev
 
     steps:
@@ -49,15 +49,62 @@ jobs:
           fi
           sudo apt install -y ${{ matrix.mysql_lib }}
 
+          # ── PostgreSQL ────────────────────────────────────────────────────
+          sudo systemctl start postgresql.service
+          # Create a superuser role matching the runner OS user so that
+          # postgresql:/// (peer-auth, db == username) works without a password.
+          sudo -u postgres createuser --superuser "$USER"
+          createdb  # creates database named after $USER
+          echo "ASQL_PG_TEST_DB=postgresql:///" >> "$GITHUB_ENV"
+
+          # ── MySQL / MariaDB ───────────────────────────────────────────────
+          # GitHub-hosted Ubuntu runners ship MySQL with root/root credentials.
+          sudo systemctl start mysql.service
+          mysql -u root -proot -e "CREATE DATABASE IF NOT EXISTS asql_test;"
+          mysql -u root -proot -e \
+            "CREATE USER IF NOT EXISTS 'asql'@'localhost' IDENTIFIED BY 'asql';"
+          mysql -u root -proot -e \
+            "GRANT ALL PRIVILEGES ON asql_test.* TO 'asql'@'localhost'; FLUSH PRIVILEGES;"
+          echo "ASQL_MYSQL_TEST_DB=mysql://asql:asql@localhost/asql_test" >> "$GITHUB_ENV"
+
       - name: Install dependencies on macOS
         if: runner.os == 'macOS'
         run: |
           brew install postgresql@16
+          brew services start postgresql@16
+          # Wait until the server accepts connections
+          until pg_isready --host=localhost --port=5432; do sleep 1; done
+          # Ensure a database exists for the runner user (required for postgresql:///)
+          createdb || true
 
-      - name: Install PostgreSQL 16 with Chocolatey
+      - name: Set up PostgreSQL on Windows
         if: runner.os == 'Windows'
+        shell: pwsh
         run: |
-          choco install postgresql --version=16.0 -y
+          # PostgreSQL is pre-installed on windows-latest but stopped/disabled.
+          # Find whichever version's service is present (14, 15, 16, ...).
+          $pgSvc = Get-Service -Name "postgresql-x64-*" -ErrorAction SilentlyContinue |
+                     Select-Object -First 1
+          if (-not $pgSvc) {
+            Write-Error "No postgresql-x64-* service found on this runner."
+            exit 1
+          }
+          Write-Host "Found service: $($pgSvc.Name)"
+          Set-Service -Name $pgSvc.Name -StartupType Automatic
+          Start-Service -Name $pgSvc.Name
+          # Locate pg_isready / createdb via the PGBIN env var set by the image
+          $pgBin = [System.Environment]::GetEnvironmentVariable('PGBIN')
+          if (-not $pgBin) {
+            # Fall back: find bin/ next to the service executable
+            $pgBin = Split-Path (Get-WmiObject Win32_Service -Filter "Name='$($pgSvc.Name)'").PathName
+          }
+          & "$pgBin\pg_isready.exe" --host=localhost --port=5432 --timeout=30
+          $env:PGPASSWORD = 'root'
+          & "$pgBin\createdb.exe" -U postgres asql_test
+          $pgDir = Split-Path $pgBin  # C:\Program Files\PostgreSQL\14
+          "ASQL_PG_TEST_DB=postgresql://postgres:root@localhost/asql_test" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          "PGDIR=$pgDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Install Qt with options and default aqtversion
         uses: jurplel/install-qt-action@v4
@@ -74,13 +121,13 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure project (Shared Link)
         run: >
           cmake -S . -B ./build-shared -G Ninja
           -DCMAKE_BUILD_TYPE=Debug
-          -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;C:\Program Files\PostgreSQL\16"
+          -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;${{ env.PGDIR }}"
           -DENABLE_MAINTAINER_CFLAGS=${{ matrix.build_type == 'Debug' }}
           -DBUILD_SHARED_LIBS=ON
           -DASQL_DRIVER_MYSQL=${{ runner.os == 'Linux' }}
@@ -104,7 +151,7 @@ jobs:
         run: >
           cmake -S . -B ./build-static -G Ninja
           -DCMAKE_BUILD_TYPE=Debug
-          -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;C:\Program Files\PostgreSQL\16"
+          -DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;${{ env.PGDIR }}"
           -DBUILD_SHARED_LIBS=OFF
           -DASQL_DRIVER_MYSQL=${{ runner.os == 'Linux' }}
           -DASQL_DRIVER_ODBC=${{ runner.os == 'Linux' }}

.github/workflows/documentation.yml

@@ -40,7 +40,7 @@ jobs:
           doc-archives: 'qtcore'
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 

.github/workflows/nightly.yml

@@ -13,16 +13,16 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-24.04
+          - ubuntu-latest
 
         config:
           - name: clang-tidy
             cmake_arg: '-DCMAKE_CXX_CLANG_TIDY=clang-tidy'
-            qt_version: "6.7.3"
+            qt_version: "6.11.0"
 
           - name: clazy
             cmake_arg: '-DCMAKE_CXX_COMPILER=clazy'
-            qt_version: "6.7.3"
+            qt_version: "6.11.0"
 
     steps:
       - name: Install dependencies on Ubuntu
@@ -40,7 +40,7 @@ jobs:
       - name: Install ninja-build tool (must be after Qt due PATH changes)
         uses: turtlesec-no/get-ninja@main
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Configure project
         run: >

CMakeLists.txt

@@ -8,7 +8,7 @@ include(GNUInstallDirs)
 include(GenerateExportHeader)
 
 find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 6.4.0 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} 6.5.0 COMPONENTS Core REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
 

README.md

@@ -23,7 +23,7 @@ Qt Async Sql library
 * Single row mode (useful for very large datasets)
 
 ## Requirements
-* Qt 6.4 or later
+* Qt 6.5 or later
 * C++23 capable compiler (g++-14 or newer is required).
 
 ## Usage

src/ADriverOdbc.cpp

@@ -360,7 +360,7 @@ QVariant AOdbcThread::columnValue(SQLHSTMT stmt, SQLUSMALLINT col, SQLSMALLINT s
         // SQL_TYPE_TIMESTAMP (datetime/datetime2) carries no timezone info.
         // Use Qt::LocalTime to match QSql ODBC behaviour: the value is returned as-is
         // without any UTC offset, so toString() won't append "Z".
-        return QDateTime(date, time, Qt::LocalTime);
+        return QDateTime(date, time, QTimeZone::LocalTime);
     }
 
     default:

tests/CMakeLists.txt

@@ -19,6 +19,14 @@ function(asql_test _testname _driver)
     add_executable(${_testname} ${_testname}.cpp)
     add_test(NAME ${_testname} COMMAND ${_testname})
     target_link_libraries(${_testname} PUBLIC ${_driver} coverage_test)
+    if(WIN32)
+        # On Windows with shared libs the project DLLs (ASqlQt6.dll, driver DLL)
+        # live in CMAKE_RUNTIME_OUTPUT_DIRECTORY alongside the test executable.
+        # Prepend that directory to PATH so the loader finds them.
+        set_tests_properties(${_testname} PROPERTIES
+            ENVIRONMENT_MODIFICATION
+                "PATH=path_list_prepend:$<TARGET_FILE_DIR:${_testname}>")
+    endif()
 endfunction()
 
 # Shared OBJECT library with type round-trip test implementations.
@@ -43,12 +51,22 @@ function(asql_types_test _testname _driver)
     add_executable(${_testname} ${_testname}.cpp)
     add_test(NAME ${_testname} COMMAND ${_testname})
     target_link_libraries(${_testname} PUBLIC ${_driver} coverage_test types_test_common)
+    if(WIN32)
+        set_tests_properties(${_testname} PROPERTIES
+            ENVIRONMENT_MODIFICATION
+                "PATH=path_list_prepend:$<TARGET_FILE_DIR:${_testname}>")
+    endif()
 endfunction()
 
 function(asql_prepared_test _testname _driver)
     add_executable(${_testname} ${_testname}.cpp)
     add_test(NAME ${_testname} COMMAND ${_testname})
     target_link_libraries(${_testname} PUBLIC ${_driver} coverage_test prepared_test_common)
+    if(WIN32)
+        set_tests_properties(${_testname} PROPERTIES
+            ENVIRONMENT_MODIFICATION
+                "PATH=path_list_prepend:$<TARGET_FILE_DIR:${_testname}>")
+    endif()
 endfunction()
 
 if (ASQL_DRIVER_SQLITE)

tests/CoverageObject.hpp

@@ -30,15 +30,15 @@ private Q_SLOTS:
     do { \
         if (![](auto &&qt_lhs_arg, auto &&qt_rhs_arg) { \
             /* assumes that op does not actually move from qt_{lhs, rhs}_arg */ \
-            return QTest::reportResult(std::forward<decltype(qt_lhs_arg)>(qt_lhs_arg) \
-                                           op std::forward<decltype(qt_rhs_arg)>(qt_rhs_arg), \
-                                       [&qt_lhs_arg] { return QTest::toString(qt_lhs_arg); }, \
-                                       [&qt_rhs_arg] { return QTest::toString(qt_rhs_arg); }, \
-                                       #lhs, \
-                                       #rhs, \
-                                       QTest::ComparisonOperation::opId, \
-                                       __FILE__, \
-                                       __LINE__); \
+            const bool qt_result = std::forward<decltype(qt_lhs_arg)>(qt_lhs_arg) \
+                op std::forward<decltype(qt_rhs_arg)>(qt_rhs_arg); \
+            QT_WARNING_PUSH \
+            QT_WARNING_DISABLE_DEPRECATED \
+            return QTest::reportResult( \
+                qt_result, [&qt_lhs_arg] { return QTest::toString(qt_lhs_arg); }, [&qt_rhs_arg] { \
+                return QTest::toString(qt_rhs_arg); \
+            }, #lhs, #rhs, QTest::ComparisonOperation::opId, __FILE__, __LINE__); \
+            QT_WARNING_POP \
         }(lhs, rhs)) { \
             co_return; \
         } \