ODBC-454 Error in SQLForeignKeys in keys of FK parameters only and no FK

in the given table(or it does not exist). The driver formed wrong query
in this case.
The fix and the testcase.
Also cmake min version increased to 3.12.0 as C/C has done the same and
there is no sense to keep smaller version.

Author: lawrinn

CMakeLists.txt

@@ -17,7 +17,7 @@
 #   51 Franklin St., Fifth Floor, Boston, MA 02110, USA
 # *************************************************************************************/
 
-cmake_minimum_required(VERSION 2.8.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12.0)
 
 IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.20.0")
   CMAKE_POLICY(SET CMP0115 NEW)
@@ -26,9 +26,6 @@ CMAKE_POLICY(SET CMP0048 NEW)
 CMAKE_POLICY(SET CMP0040 NEW)
 CMAKE_POLICY(SET CMP0057 NEW)
 CMAKE_POLICY(SET CMP0054 NEW)
-IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.20.0")
-  CMAKE_POLICY(SET CMP0115 NEW)
-ENDIF()
 
 PROJECT(mariadb_connector_odbc 
         VERSION 3.2.5

driver/ma_catalog.cpp

@@ -1108,8 +1108,9 @@ SQLRETURN MADB_StmtForeignKeys(MADB_Stmt *Stmt, char *PKCatalogName, SQLSMALLINT
       Stmt->Connection->guard->safeRealQuery(aux.str());
       auto result= mysql_store_result(Stmt->Connection->mariadb);
 
-      if (result == nullptr)
+      if (result == nullptr || mysql_num_rows(result) == 0)
       {
+        mysql_free_result(result);
         //Does not matter what are they, but we need to put there something
         if (refSchemaCond)
           schemaCond= refSchemaCond;

driver/ma_desc.cpp

@@ -264,7 +264,7 @@ MADB_SetIrdRecord(MADB_Stmt *Stmt, MADB_DescRecord *Record, const MYSQL_FIELD *F
   }
 
 
-  if (0)//Stmt->Connection->IsAnsi == '\0')
+  if (false)/*!Stmt->Connection->IsAnsi)*/
   {
     switch (Record->ConciseType) {
     case SQL_CHAR:        Record->ConciseType= SQL_WCHAR; break;

driver/ma_helper.cpp

@@ -246,7 +246,7 @@ const char *MADB_GetTypeName(const MYSQL_FIELD *Field)
 }
 /* }}} */
 
-
+/* {{{ MADB_GetDefaultColumnValues */
 MYSQL_RES *MADB_GetDefaultColumnValues(MADB_Stmt *Stmt, const MYSQL_FIELD *fields)
 {
   SQLString DynStr("SELECT COLUMN_NAME, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='");
@@ -271,7 +271,7 @@ MYSQL_RES *MADB_GetDefaultColumnValues(MADB_Stmt *Stmt, const MYSQL_FIELD *field
   Stmt->Connection->guard->safeRealQuery(DynStr);
   return mysql_store_result(Stmt->Connection->mariadb);
 }
-
+/* }}} */
 
 char *MADB_GetDefaultColumnValue(MYSQL_RES *res, const char *Column)
 {

driver/ma_statement.cpp

@@ -2628,14 +2628,14 @@ SQLRETURN MADB_GetBookmark(MADB_Stmt  *Stmt,
 }
 
 /* {{{ MADB_StmtGetData */
-SQLRETURN MADB_StmtGetData(SQLHSTMT StatementHandle,
+SQLRETURN MADB_StmtGetData(SQLHSTMT     StatementHandle,
                            SQLUSMALLINT Col_or_Param_Num,
-                           SQLSMALLINT TargetType,
-                           SQLPOINTER TargetValuePtr,
-                           SQLLEN BufferLength,
-                           SQLLEN * StrLen_or_IndPtr,
-                           bool   InternalUse /* Currently this is respected for SQL_CHAR type only,
-                                                 since all "internal" calls of the function need string representation of data */)
+                           SQLSMALLINT  TargetType,
+                           SQLPOINTER   TargetValuePtr,
+                           SQLLEN       BufferLength,
+                           SQLLEN*      StrLen_or_IndPtr,
+                           bool         InternalUse /* Currently this is respected for SQL_CHAR type only,
+                                                       since all "internal" calls of the function need string representation of data */)
 {
   MADB_Stmt       *Stmt= (MADB_Stmt *)StatementHandle;
   SQLUSMALLINT    Offset= Col_or_Param_Num - 1;

test/keys.c

@@ -1,6 +1,6 @@
 /*
   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-                2013, 2022 MariaDB Corporation AB
+                2013, 2025 MariaDB Corporation plc
 
   The MySQL Connector/ODBC is licensed under the terms of the GPLv2
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -117,7 +117,7 @@ ODBC_TEST(my_foreign_keys)
 
     OK_SIMPLE_STMT(Stmt,"DROP DATABASE IF EXISTS test_odbc_fk");
     OK_SIMPLE_STMT(Stmt,"CREATE DATABASE test_odbc_fk");
-    OK_SIMPLE_STMT(Stmt,"use test_odbc_fk");
+    OK_SIMPLE_STMT(Stmt,"USE test_odbc_fk");
 
     OK_SIMPLE_STMT(Stmt,"DROP TABLE IF EXISTS test_fkey_c1");
     OK_SIMPLE_STMT(Stmt,"DROP TABLE IF EXISTS test_fkey_3");
@@ -127,10 +127,9 @@ ODBC_TEST(my_foreign_keys)
     OK_SIMPLE_STMT(Stmt,"DROP TABLE IF EXISTS test_fkey_comment_f");
     OK_SIMPLE_STMT(Stmt,"DROP TABLE IF EXISTS test_fkey_comment_p");
 
-    OK_SIMPLE_STMT(Stmt,
-                       "CREATE TABLE test_fkey1(\
-                 A INTEGER NOT NULL,B INTEGER NOT NULL,C INTEGER NOT NULL,\
-                 D INTEGER,PRIMARY KEY (C,B,A)) ENGINE=InnoDB;");
+    OK_SIMPLE_STMT(Stmt, "CREATE TABLE test_fkey1("
+                         "A INTEGER NOT NULL,B INTEGER NOT NULL,C INTEGER NOT NULL,"
+                         "D INTEGER,PRIMARY KEY (C,B,A)) ENGINE=InnoDB;");
 
     OK_SIMPLE_STMT(Stmt,
                        "CREATE TABLE test_fkey_p1(\
@@ -468,12 +467,45 @@ void t_strstr()
     }
 }
 
+/* ODBC-454 */
+ODBC_TEST(odbc454)
+{
+    /* First running the way it should be */
+    CHECK_STMT_RC(Stmt, SQLForeignKeys(Stmt,
+                        NULL, SQL_NTS,
+                        NULL, SQL_NTS,
+                        NULL, SQL_NTS,
+                        (SQLCHAR *)"test_odbc_fk", SQL_NTS, /* possibly non-existent catalog aka schema suffices to repeat the issue */
+                        NULL, SQL_NTS,
+                        (SQLCHAR *)"odbc454", SQL_NTS)); /* We need here non-existent or table w/out FK's*/
+    is_num(0, myrowcount(Stmt));
+    CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+
+    /* This should normally cause error. But if the error suppressed using connstring option - everything should be fine */
+    if (SQL_SUCCEEDED(SQLForeignKeys(Stmt,
+                        NULL, SQL_NTS,
+                        NULL, SQL_NTS,
+                        NULL, SQL_NTS,
+                        NULL, SQL_NTS,
+                        (SQLCHAR *)"test_odbc_fk", SQL_NTS,
+                        (SQLCHAR *)"", SQL_NTS)))
+    {
+      is_num(0, myrowcount(Stmt));
+    }
+    else
+    {
+      odbc_print_error(SQL_HANDLE_STMT, Stmt);
+    }
+    CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+  return OK;
+}
 
 
 MA_ODBC_TESTS my_tests[]=
 {
   {my_no_keys, "my_no_keys"},
   {my_foreign_keys, "my_foreign_keys"},
+  {odbc454, "ODBC-454-nofks"},
   {NULL, NULL}
 };