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.

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,23 @@ 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: 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 --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: 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 +114,17 @@ 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
+            cd ../packaging/windows && 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"
             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 +135,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 }}

test/catalog2.c

@@ -1883,7 +1883,7 @@ ODBC_TEST(odbc361)
  * Besides other catalog functions are affected - not only SQLStatistics
  * The problem arose when application reads (db or) table name with SQLTables, and it has original letter cases,
  * but then if to use it as the parameter to (catalog or) table argument for various catalog functions, the server compares
- * it to lowercase values of (db or) table name, and it failed(since ordinary argument comparison has to be cace-sensitive.
+ * it to lowercase values of (db or) table name, and it failed(since ordinary argument comparison has to be case-sensitive.
  * The test basically makes sure, that this works
  */
 ODBC_TEST(odbc391)
@@ -1940,8 +1940,9 @@ ODBC_TEST(odbc391)
   EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
   CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
 
-  CHECK_STMT_RC(Stmt, SQLSpecialColumns(Stmt, SQL_ROWVER,  dbname, (SQLSMALLINT)dbnameLen, NULL, 0, tname, (SQLSMALLINT)tnameLen,
-                                        SQL_SCOPE_TRANSACTION, SQL_NULLABLE));
+  CHECK_STMT_RC(Stmt, SQLSpecialColumns(Stmt, SQL_ROWVER,  dbname, (SQLSMALLINT)dbnameLen, NULL, 0,
+    tname, (SQLSMALLINT)tnameLen, SQL_SCOPE_TRANSACTION,
+    ServerNotOlderThan(Connection, 10, 10, 2) || IsMysql ? SQL_NULLABLE : SQL_NO_NULLS));
   CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
   EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
   CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));

test/datetime.c

@@ -722,18 +722,27 @@ ODBC_TEST(t_bug15773)
 ODBC_TEST(t_bug9927)
 {
   SQLCHAR col[10];
+  SQLRETURN rc;
 
   OK_SIMPLE_STMT(Stmt, "DROP TABLE IF EXISTS t_bug9927");
-  OK_SIMPLE_STMT(Stmt, IsMysql ? "CREATE TABLE t_bug9927 (a TIMESTAMP,"
-                                 "b TIMESTAMP ON UPDATE CURRENT_TIMESTAMP)" :
-                        "CREATE TABLE t_bug9927 (a TIMESTAMP DEFAULT 0,"
-                        "b TIMESTAMP ON UPDATE CURRENT_TIMESTAMP)");
+  OK_SIMPLE_STMT(Stmt, "CREATE TABLE t_bug9927 (a TIMESTAMP DEFAULT '2022-02-24 05:00:00',"
+                       "b TIMESTAMP ON UPDATE CURRENT_TIMESTAMP)");
 
   /* Not sure which exactly version that was introduced, but 10.11.2 is first ga */
-  CHECK_STMT_RC(Stmt, SQLSpecialColumns(Stmt,SQL_ROWVER,  NULL, 0,
+  CHECK_STMT_RC(Stmt, SQLSpecialColumns(Stmt, SQL_ROWVER, NULL, 0,
                                    NULL, 0, (SQLCHAR *)"t_bug9927", SQL_NTS,
                                    0, ServerNotOlderThan(Connection, 10,10,2) || IsMysql ? SQL_NULLABLE : SQL_NO_NULLS));
-  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  rc= SQLFetch(Stmt);
+  if (rc == SQL_NO_DATA)
+  {
+    PrintServerVersion(Connection, FALSE);
+    CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+    OK_SIMPLE_STMT(Stmt, "SELECT DATA_TYPE,TABLE_SCHEMA,TABLE_SCHEMA=DATABASE(),IS_NULLABLE"
+                         "FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t_bug9927'");
+    my_print_non_format_result(Stmt);
+    
+  }
+  CHECK_STMT_RC(Stmt, rc);
 
   IS_STR(my_fetch_str(Stmt, col, 2), "b", 1);
 

test/tap.h

@@ -1399,12 +1399,20 @@ int sqlwcharcmp(SQLWCHAR *s1, SQLWCHAR *s2, int n)
 }
 
 
+const char* PrintServerVersion(SQLHDBC Conn, BOOL onlyReturn)
+{
+  static char ServerVersion[32];
+  SQLGetInfo(Conn, SQL_DBMS_VER, (SQLPOINTER)ServerVersion, sizeof(ServerVersion), NULL);
+  if (!onlyReturn)
+  {
+    diag(ServerVersion);
+  }
+  return ServerVersion;
+}
 BOOL ServerNotOlderThan(SQLHDBC Conn, unsigned int major, unsigned int minor, unsigned int patch)
 {
   unsigned int ServerMajor= 0, ServerMinor= 0, ServerPatch= 0;
-  SQLCHAR ServerVersion[32];
-
-  SQLGetInfo(Conn, SQL_DBMS_VER, ServerVersion, sizeof(ServerVersion), NULL);
+  const char *ServerVersion= PrintServerVersion(Conn, TRUE);
 
   sscanf((const char*)ServerVersion, "%u.%u.%u", &ServerMajor, &ServerMinor, &ServerPatch);