Fix of couple of merge errors

Driver is instaleed as 3.2, library is under driver in 3.2
Fixed 2 tests for iOdbc.

Author: lawrinn

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ env:
   MYSQL_TEST_USER: root
   MYSQL_TEST_PASSWD: "heyPassw+-_20oRd"
   MYSQL_TEST_DB: testo
+  TEST_DRIVER: ${{ github.workspace }}/driver/libmaodbc.so
   TEST_DSN: maodbc_test
   TEST_UID: root
   TEST_SERVER: mariadb.example.com
@@ -28,7 +29,7 @@ env:
   TEST_SCHEMA: testo
   ODBCINI: "${{ github.workspace }}/test/odbc.ini"
   ODBCSYSINI: ${{ github.workspace }}/test
-  ODBCINTSTINI: ${{ github.workspace }}/test/odbcinst.ini
+  ODBCINSTINI: ${{ github.workspace }}/test/odbcinst.ini
 
 jobs:
   setup:
@@ -85,8 +86,8 @@ jobs:
           brew install libiodbc openssl
           ls -lrt /opt/homebrew/opt/libiodbc/lib
           
-          TEST_DRIVER=${{ github.workspace }}/RelWithDebInfo/libmaodbc.dylib
-          echo "TEST_DRIVER=${{ github.workspace }}/RelWithDebInfo/libmaodbc.dylib" >> $GITHUB_ENV
+          TEST_DRIVER=${{ github.workspace }}/driver/RelWithDebInfo/libmaodbc.dylib
+          echo "TEST_DRIVER=${{ github.workspace }}/driver/RelWithDebInfo/libmaodbc.dylib" >> $GITHUB_ENV
           cmake -G Xcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DWITH_SIGNCODE=OFF -DODBC_LIB_DIR=/opt/homebrew/opt/libiodbc/lib -DODBC_INCLUDE_DIR=/opt/homebrew/opt/libiodbc/include -DCONC_WITH_MSI=OFF -DCONC_WITH_UNIT_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=OPENSSL -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -DWITH_EXTERNAL_ZLIB=On .
           cmake --build . --config RelWithDebInfo
 
@@ -108,17 +109,23 @@ jobs:
         shell: powershell
         run: |
           pwd
-          ls ${{ github.workspace }}\packaging\windows
+          echo "--------------"
+          ls ${{ github.workspace }}\packaging\windows\*.msi
+          echo "--------------"
           Get-ChildItem -Path ${{ github.workspace }}\packaging\windows\mariadb-connector-odbc-*.msi
+          echo "--------------"
           $log = "install.log"
           foreach ($msi in Get-ChildItem -Path ${{ github.workspace }}\packaging\windows\mariadb-connector-odbc-*.msi) {
-            $procInstall= Start-Process msiexec.exe -ArgumentList "/i $($msi.FullName) /qn /norestart" -NoNewWindow -PassThru
+            echo $msi
+            echo "--------------"
+            Start-Process msiexec.exe -ArgumentList "/i $($msi.FullName) /qn /norestart" -NoNewWindow -PassThru
             #$procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru 
             #$procMain.WaitForExit() 
             #$procLog.Kill()
           }
+          echo "=========="
           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" )
+          Add-OdbcDsn -Name $env:TEST_DSN -DriverName "MariaDB ODBC 3.2 Driver" -DsnType "User" -SetPropertyValue @( "SERVER=$env:TEST_SERVER", "DATABASE=$env:TEST_SCHEMA", "USER=$env:TEST_UID", "PASSWORD=$env:TEST_PASSWORD", "PORT=$env:TEST_PORT" )
 
       - name: Run test suite
         shell: bash
@@ -134,17 +141,18 @@ jobs:
           fi
 
           if [[ "${RUNNER_OS}" == "Windows" ]]; then
-            TEST_DRIVER="MariaDB ODBC 3.1 Driver"
+            TEST_DRIVER="MariaDB ODBC 3.2 Driver"
             # INSTALLFOLDER=''
             ls ./RelWithDebInfo
-            set +x
-            #odbcconf CONFIGDSN "$TEST_DRIVER" "DSN=$TEST_DSN;SERVER=$TEST_SERVER;DATABASE=$TEST_SCHEMA;USER=$TEST_UID;PASSWORD=$TEST_PASSWORD;PORT=$TEST_PORT;$TEST_ADD_PARAM"
             set -ex
           else
 
             cat $ODBCINSTINI
             cat $ODBCINI | grep -v PASSWORD
 
+            ls ../driver/
+            echo "$TEST_DRIVER"
+
             chmod 666 $ODBCINI $ODBCSYSINI/odbcinst.ini
             ls -lrt
           fi

test/bulk.c

@@ -782,6 +782,7 @@ ODBC_TEST(t_odbc460)
     }
     else {
       // It was last run - cleaning after onceself
+      CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
       OK_SIMPLE_STMT(Stmt, "DROP TABLE IF EXISTS t_odbc460");
       CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_DROP));
     }

test/info.c

@@ -896,13 +896,13 @@ ODBC_TEST(driver_ver)
   SQLSMALLINT len= 0;
 
   CHECK_DBC_RC(wConnection, SQLGetInfoW(wConnection, SQL_DRIVER_VER, wBuffer, sizeof(wBuffer), &len));
-  is_num(len, 20);
+  is_num(len, 10*sizeof(SQLWCHAR));
   wBuffer[0]= 0;
   CHECK_DBC_RC(wConnection, SQLGetInfo(wConnection, SQL_DRIVER_VER, buffer, sizeof(buffer), &len));
   is_num(len, 10);
 
   CHECK_DBC_RC(Connection, SQLGetInfoW(Connection, SQL_DRIVER_VER, wBuffer, sizeof(wBuffer), &len));
-  is_num(len, 20);
+  is_num(len, 10 * sizeof(SQLWCHAR));
   buffer[0]= 0;
   CHECK_DBC_RC(Connection, SQLGetInfo(Connection, SQL_DRIVER_VER, buffer, sizeof(buffer), &len));
   is_num(len, 10);