Fix of error in connstring in actions on MacOS

Fixed some testcases(merged from 3.2 and new fix).
Added output of additional debug info to actions config and to failing
tests.
Changed tests to use direct linking on Windows, and changed some tests and
the driver to eliminate (most of) failures in that mode

Added installation of WiX with choco

Author: lawrinn

.github/workflows/ci.yml

@@ -20,6 +20,15 @@ env:
   MYSQL_TEST_USER: root
   MYSQL_TEST_PASSWD: "heyPassw+-_20oRd"
   MYSQL_TEST_DB: testo
+  TEST_DSN: maodbc_test
+  TEST_UID: root
+  TEST_SERVER: mariadb.example.com
+  TEST_PASSWORD: "heyPassw+-_20oRd"
+  TEST_PORT: 3306
+  TEST_SCHEMA: testo
+  ODBCINI: "${{ github.workspace }}/test/odbc.ini"
+  ODBCSYSINI: ${{ github.workspace }}/test
+  ODBCINTSTINI: ${{ github.workspace }}/test/odbcinst.ini
 
 jobs:
   setup:
@@ -69,13 +78,6 @@ jobs:
           sudo apt install unixodbc-dev
           cmake -DCONC_WITH_MSI=OFF -DCONC_WITH_UNIT_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=OPENSSL .
           cmake --build . --config RelWithDebInfo 
-        env:
-          TEST_DSN: maodbc_test
-          TEST_UID: ${{ env.MYSQL_TEST_USER }}
-          TEST_SERVER: ${{ env.MYSQL_TEST_HOST }}
-          TEST_PASSWORD: ${{ env.MYSQL_TEST_PASSWD }}
-          TEST_PORT: ${{ env.MYSQL_TEST_PORT }}
-          TEST_SCHEMA: ${{ env.MYSQL_TEST_DB }}
 
       - name: make macos
         if: ${{ startsWith(matrix.os, 'mac') }}
@@ -87,38 +89,44 @@ jobs:
           echo "TEST_DRIVER=${{ github.workspace }}/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
-        env:
-          TEST_DSN: maodbc_test
-          TEST_UID: ${{ env.MYSQL_TEST_USER }}
-          TEST_SERVER: ${{ env.MYSQL_TEST_HOST }}
-          TEST_PASSWORD: ${{ env.MYSQL_TEST_PASSWD }}
-          TEST_PORT: ${{ env.MYSQL_TEST_PORT }}
-          TEST_SCHEMA: ${{ env.MYSQL_TEST_DB }}
+
+      - name: Install WiX
+        if: ${{ startsWith(matrix.os, 'windows') }}
+        shell: powershell
+        run: |
+          choco install wixtoolset -y
 
       - name: make windows
         if: ${{ startsWith(matrix.os, 'windows') }}
         shell: powershell
         run: |
-          cmake -DCONC_WITH_MSI=OFF -DCONC_WITH_UNIT_TESTS=OFF -DWITH_MSI=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=SCHANNEL .
+          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 
-        env:
-          TEST_DSN: maodbc_test
-          TEST_UID: ${{ env.MYSQL_TEST_USER }}
-          TEST_SERVER: ${{ env.MYSQL_TEST_HOST }}
-          TEST_PASSWORD: ${{ env.MYSQL_TEST_PASSWD }}
-          TEST_PORT: ${{ env.MYSQL_TEST_PORT }}
-          TEST_SCHEMA: ${{ env.MYSQL_TEST_DB }}
+
+      - name: Install generated MSI (Windows only)
+        if: startsWith(matrix.os, 'windows')
+        shell: powershell
+        run: |
+          pwd
+          ls ${{ github.workspace }}\packaging\windows
+          Get-ChildItem -Path ${{ github.workspace }}\packaging\windows\mariadb-connector-odbc-*.msi
+          $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
+            #$procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru 
+            #$procMain.WaitForExit() 
+            #$procLog.Kill()
+          }
 
       - name: Run test suite
         shell: bash
         run: |
           echo "$PWD"
           
-
-          ls -lrt
+          chmod 777 test
+          ls -lrta
           cd ./test
           echo "$PWD"
-          ls -lrt
           if [ "$DB_TYPE" = "mysql" ] ; then
             cp ../libmariadb/caching_sha2_password.* ../
           fi
@@ -127,16 +135,16 @@ jobs:
             TEST_DRIVER="MariaDB ODBC 3.1 Driver"
             # INSTALLFOLDER=''
             ls ./RelWithDebInfo
-            cd ../wininstall && for msi in mariadb-connector-odbc-*.msi ; do msiexec /i $msi  /qn /norestart; done
             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"
+            #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
-            export ODBCINI="${{ github.workspace }}/test/odbc.ini"
-            export ODBCSYSINI=${{ github.workspace }}/test
 
-            cat $ODBCSYSINI/odbcinst.ini
-            cat $ODBCSYSINI/odbc.ini | grep -v PASSWORD
+            cat $ODBCINSTINI
+            cat $ODBCINI | grep -v PASSWORD
+
+            chmod 666 $ODBCINI $ODBCSYSINI/odbcinst.ini
+            ls -lrt
           fi
           ctest --verbose
 
@@ -147,13 +155,7 @@ jobs:
           DB_TYPE: ${{ matrix.db-type }}
           LOCAL_DB: ${{ steps.setup-env.outputs.database-type }}
           os: ${{ matrix.os }}
-          TEST_DSN: maodbc_test
           TEST_DRIVER: ${{ env.TEST_DRIVER || 'maodbc_test' }}
-          TEST_UID: ${{ env.MYSQL_TEST_USER }}
-          TEST_SERVER: ${{ env.MYSQL_TEST_HOST }}
-          TEST_PASSWORD: ${{ env.MYSQL_TEST_PASSWD }}
-          TEST_PORT: ${{ env.MYSQL_TEST_PORT }}
-          TEST_SCHEMA: ${{ env.MYSQL_TEST_DB }}
           TEST_SOCKET:
           SSLCERT: ${{ matrix.db-type == 'container' && format('{0}/.github/workflows/certs/server.crt', github.workspace) || '' }}
           MARIADB_PLUGIN_DIR: ${{ github.workspace }}

CMakeLists.txt

@@ -535,6 +535,11 @@ ENDIF()
 # Tests. Should be verified by now, if we have them.
 IF(WITH_UNIT_TESTS)
   ADD_SUBDIRECTORY(test)
+
+  IF(DIRECT_LINK_TESTS)
+    ADD_CUSTOM_COMMAND(TARGET ${LIBRARY_NAME} POST_BUILD
+	    COMMAND ${CMAKE_COMMAND} ARGS -E copy $<TARGET_FILE:${LIBRARY_NAME}> test)
+  ENDIF()
   IF(NOT WIN32)
     # Configuring ini files for testing with UnixODBC
     MESSAGE(STATUS "Configurig Test Driver: ${TEST_DRIVER}, Test DSN: ${TEST_DSN}, tcp://${TEST_UID}@${TEST_SERVER}:${TEST_PORT}/${TEST_SCHEMA} socket: ${TEST_SOCKET}")

ma_catalog.c

@@ -584,7 +584,7 @@ SQLRETURN MADB_StmtColumns(MADB_Stmt *Stmt,
       if (MADB_DYNAPPENDCONST(&StmtStr, "=DATABASE()"))
         goto dynerror;
 
-    if (TableName && NameLength3)
+    if (TableName/* && NameLength3*/)
     {
       if (MADB_DynstrAppend(&StmtStr, "AND TABLE_NAME") ||
         AddPvOrIdCondition(Stmt, (void*)&StmtStr, (size_t)-1, TableName, NameLength3))
@@ -859,6 +859,12 @@ SQLRETURN MADB_StmtSpecialColumns(MADB_Stmt *Stmt, SQLUSMALLINT IdentifierType,
     }
     p+= _snprintf(p, sizeof(StmtStr) - (p - StmtStr), "ORDER BY TABLE_SCHEMA, TABLE_NAME, COLUMN_KEY");
   }
+#ifdef __APPLE__
+  if (getenv("GITHUB_ACTIONS") != NULL && strncmp(getenv("GITHUB_ACTIONS"), "true", 4) == 0 && IdentifierType == SQL_ROWVER)
+  {
+    printf("# \"%s\"(%hu)\n", StmtStr, Nullable);
+  }
+#endif // __APPLE__
   return Stmt->Methods->ExecDirect(Stmt, StmtStr, SQL_NTS);
 }
 /* }}} */

ma_connection.c

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2013,2023 MariaDB Corporation AB
+   Copyright (C) 2013,2025 MariaDB Corporation plc
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -252,6 +252,11 @@ SQLRETURN MADB_DbcSetAttr(MADB_Dbc *Dbc, SQLINTEGER Attribute, SQLPOINTER ValueP
       MADB_FREE(Dbc->CatalogName);
       if (isWChar)
       {
+        /* This can happen with direct linking only */
+        if (StringLength == SQL_NTS)
+        {
+          StringLength= (SQLINTEGER)(SqlwcsLen((SQLWCHAR*)ValuePtr, -1) * sizeof(SQLWCHAR));
+        }
         /* IsAnsi will be set before this, even if it is set before connection
            StringLength from DM here is octets length */
         Dbc->CatalogName= MADB_ConvertFromWCharEx((SQLWCHAR *)ValuePtr, StringLength/ sizeof(SQLWCHAR), NULL, Dbc->ConnOrSrcCharset, NULL, TRUE);
@@ -411,6 +416,12 @@ SQLRETURN MADB_DbcGetAttr(MADB_Dbc *Dbc, SQLINTEGER Attribute, SQLPOINTER ValueP
     SQLSMALLINT StrLen;
     SQLRETURN   ret;
 
+    /* This is normally cared by DM and this is only for direct linking case - if connection has not been established yet,
+       returnring error */
+    if (Dbc->mariadb == NULL && Dbc->CatalogName == NULL)
+    {
+      return MADB_SetError(&Dbc->Error, MADB_ERR_08003, NULL, 0);
+    }
     ret= Dbc->Methods->GetCurrentDB(Dbc, ValuePtr, BufferLength, &StrLen, isWChar);
     /* if we weren't able to determine the current db, we will return the cached catalog name */
     if (!SQL_SUCCEEDED(ret) && Dbc->CatalogName)
@@ -436,7 +447,7 @@ SQLRETURN MADB_DbcGetAttr(MADB_Dbc *Dbc, SQLINTEGER Attribute, SQLPOINTER ValueP
     /* SQL_ATTR_METADATA_ID is SQLUINTEGER attribute on connection level, but SQLULEN on statement level :/ */
     *(SQLUINTEGER *)ValuePtr= Dbc->MetadataId;
   case SQL_ATTR_ODBC_CURSORS:
-    *(SQLULEN*)ValuePtr= SQL_CUR_USE_ODBC;
+    *(SQLULEN*)ValuePtr= SQL_CUR_USE_DRIVER;
     break;
   case SQL_ATTR_ENLIST_IN_DTC:
     /* MS Distributed Transaction Coordinator not supported */

ma_dsn.c

@@ -424,7 +424,7 @@ my_bool MADB_SaveDSN(MADB_Dsn *Dsn)
   }
   if (!SQLWriteDSNToIni(Dsn->DSNName, Dsn->Driver))
   {
-    SQLInstallerError(1,&ErrNum, Dsn->ErrorMsg, SQL_MAX_MESSAGE_LENGTH, NULL);
+    SQLInstallerError((WORD)1,&ErrNum, Dsn->ErrorMsg, (WORD)SQL_MAX_MESSAGE_LENGTH, NULL);
     return FALSE;
   }
 

ma_environment.c

@@ -160,7 +160,7 @@ SQLRETURN MADB_EnvSetAttr(MADB_Env* Env, SQLINTEGER Attribute, SQLPOINTER ValueP
    case SQL_ATTR_ODBC_VERSION:
     if (Env->Dbcs)
     {
-      MADB_SetError(&Env->Error, MADB_ERR_HYC00, NULL, 0);
+      MADB_SetError(&Env->Error, MADB_ERR_HY010, NULL, 0);
       return Env->Error.ReturnValue;
     }
     Env->OdbcVersion= (SQLINTEGER)(SQLLEN)ValuePtr;

maodbc.def

@@ -6,6 +6,7 @@ SQLAllocHandle;
 SQLAllocStmt;
 SQLBindCol;
 SQLBindParameter;
+SQLBindParam;
 SQLBrowseConnect;
 SQLBrowseConnectW;
 SQLBulkOperations;

mariadb-odbc-driver.def.in

@@ -6,6 +6,7 @@ SQLAllocEnv
 SQLAllocHandle
 SQLAllocStmt
 SQLBindCol
+SQLBindParam
 SQLBindParameter
 SQLBrowseConnect
 SQLBrowseConnect@UNICODE@

odbc_3_api.c

@@ -2603,7 +2603,7 @@ SQLRETURN SQL_API SQLSetParam(SQLHSTMT stmt,
 /* }}} */
 
 /* {{{ SQLBindParam - we need it for direct linking mainly */
-SQLRETURN  SQL_API SQLBindParam(SQLHSTMT StatementHandle,
+SQLRETURN SQL_API SQLBindParam(SQLHSTMT StatementHandle,
                                 SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
                                 SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
                                 SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
@@ -2681,7 +2681,12 @@ SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
   if (!Stmt)
     return SQL_INVALID_HANDLE;
   MADB_CLEAR_ERROR(&Stmt->Error);
-
+#ifdef __APPLE__
+  if (getenv("GITHUB_ACTIONS") != NULL && strncmp(getenv("GITHUB_ACTIONS"), "true", 4) == 0 && IdentifierType == SQL_ROWVER)
+  {
+    printf("# -- Nullable: %hu)\n", Nullable);
+  }
+#endif // __APPLE__
   return Stmt->Methods->SpecialColumns(Stmt,IdentifierType, (char *)CatalogName, NameLength1, 
                                        (char *)SchemaName, NameLength2,
                                        (char *)TableName, NameLength3, Scope, Nullable);
@@ -2723,7 +2728,12 @@ SQLRETURN SQL_API SQLSpecialColumnsW(SQLHSTMT StatementHandle,
   {
     CpTable = MADB_ConvertFromWChar(TableName, NameLength3, &CpLength3, Stmt->Connection->ConnOrSrcCharset, NULL);
   }
-
+#ifdef __APPLE__
+  if (getenv("GITHUB_ACTIONS") != NULL && strncmp(getenv("GITHUB_ACTIONS"), "true", 4) == 0 && IdentifierType == SQL_ROWVER)
+  {
+    printf("# -- Nullable: %hu)\n", Nullable);
+  }
+#endif // __APPLE__
   ret= Stmt->Methods->SpecialColumns(Stmt,IdentifierType, CpCatalog, (SQLSMALLINT)CpLength1, CpSchema, 
                                      (SQLSMALLINT)CpLength2, CpTable, (SQLSMALLINT)CpLength3, Scope, Nullable);
   MADB_FREE(CpCatalog);

test/basic.c

@@ -638,7 +638,7 @@ ODBC_TEST(t_bug30840)
   SQLCHAR   conn[512], conn_out[1024];
   SQLSMALLINT conn_out_len;
 
-  if (using_dm(Connection))
+  if (using_dm())
   {
     diag("test doesn't work with (all) driver manager(s)");
     return SKIP;