Changed used tests configuration repo. Added 32b build

Added pause after driver installation in Windows testing

Author: lawrinn

.github/workflows/ci.yml

@@ -41,9 +41,9 @@ jobs:
       - uses: actions/checkout@v4
       - id: set-matrix
         name: build matrix
-        uses: rusher/mariadb-test-build-matrix@main
+        uses: mariadb-corporation/connector-ci-build-matrix@main
         with:
-          additional-matrix: '[]'
+          additional-matrix: '[{"name": "MariaDB 11.4 (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4"},{"name": "MariaDB 11.4 32bits (local) - windows 2025", "os": "windows-2025", "db-type": "community", "db-tag": "11.4", "arch": "32"}]'
 
   ci:
     name: ${{ matrix.name }}
@@ -59,7 +59,7 @@ jobs:
 
       - name: Setup Test Environment
         id: setup-env
-        uses: rusher/mariadb-test-setup@master
+        uses: mariadb-corporation/connector-ci-setup@master
         with:
           node-version: ${{ matrix.node }}
           db-type: ${{ matrix.db-type }}
@@ -96,13 +96,19 @@ jobs:
         run: |
           choco install wixtoolset -y
 
-      - name: make windows
-        if: ${{ startsWith(matrix.os, 'windows') }}
+      - name: make windows 64bits
+        if: ${{ startsWith(matrix.os, 'windows') && (matrix.arch != '32' || !matrix.arch) }}
         shell: powershell
         run: |
           cmake -DCONC_WITH_MSI=OFF -DCONC_WITH_UNIT_TESTS=OFF -DWITH_MSI=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=SCHANNEL . #-DDIRECT_LINK_TESTS=1 .
           cmake --build . --config RelWithDebInfo 
 
+      - name: make windows 32bits
+        if: ${{ startsWith(matrix.os, 'windows') && startsWith(matrix.arch, '32') }}
+        run: |
+          cmake -A Win32 -DCONC_WITH_MSI=OFF -DCONC_WITH_UNIT_TESTS=OFF -DWITH_MSI=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=SCHANNEL . #-DDIRECT_LINK_TESTS=1 .
+          cmake --build . --config RelWithDebInfo 
+
       - name: Install generated MSI (Windows only)
         if: startsWith(matrix.os, 'windows')
         shell: powershell
@@ -117,6 +123,7 @@ jobs:
             #$procMain.WaitForExit() 
             #$procLog.Kill()
           }
+          Start-Sleep -Milliseconds 500
           Get-OdbcDriver -Platform "64-bit"
           Add-OdbcDsn -Name $env:TEST_DSN -DriverName "MariaDB ODBC 3.1 Driver" -DsnType "User" -SetPropertyValue @( "SERVER=$env:TEST_SERVER", "DATABASE=$env:TEST_SCHEMA", "USER=$env:TEST_UID", "PASSWORD=$env:TEST_PASSWORD", "PORT=$env:TEST_PORT" )
 

test/catalog2.c

@@ -1407,7 +1407,7 @@ ODBC_TEST(odbc185)
 
   OK_SIMPLE_STMT(hstmt1, "DROP TABLE IF EXISTS t_odbc185");
   CHECK_STMT_RC(hstmt1, SQLExecDirectW(hstmt1,
-    W(L"CREATE TABLE t_odbc185 (ccol CHAR(32), vcfield VARCHAR(32) not null, tcol TEXT, ttcol TINYTEXT, mtcol MEDIUMTEXT,\
+    W(L"CREATE TABLE t_odbc185 (ccol CHAR(32), vcfield VARCHAR(32) NOT NULL, tcol TEXT, ttcol TINYTEXT, mtcol MEDIUMTEXT,\
                         ltcol LONGTEXT, ecol ENUM('enum val 1', 'enum val 2'), scol SET('set m1', 'set m3'))"), SQL_NTS));
 
   /* It doesn't matter if we call SQLColumns or SQLColumnsW */