- Fixed bug #42414 (some odbc_*() functions incompatible with Oracle ODBC driver)

ext/odbc/php_odbc.c

@@ -3122,6 +3122,10 @@ PHP_FUNCTION(odbc_columns)
 		schema = NULL;
 	}
 
+	if (cat && cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLColumns(result->stmt, 
 			cat, (SQLSMALLINT) cat_len,
 			schema, (SQLSMALLINT) schema_len,
@@ -3185,6 +3189,10 @@ PHP_FUNCTION(odbc_columnprivileges)
 		RETURN_FALSE;
 	}
 	
+	if (cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLColumnPrivileges(result->stmt, 
 			cat, SAFE_SQL_NTS(cat),
 			schema, SAFE_SQL_NTS(schema),
@@ -3261,6 +3269,10 @@ PHP_FUNCTION(odbc_foreignkeys)
 		RETURN_FALSE;
 	}
 	
+	if (pcat_len == 0) {
+		pcat = NULL;
+	}
+
 	rc = SQLForeignKeys(result->stmt, 
 			pcat, SAFE_SQL_NTS(pcat), 
 			pschema, SAFE_SQL_NTS(pschema), 
@@ -3386,6 +3398,10 @@ PHP_FUNCTION(odbc_primarykeys)
 		RETURN_FALSE;
 	}
 	
+	if (cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLPrimaryKeys(result->stmt, cat, SAFE_SQL_NTS(cat), schema, SAFE_SQL_NTS(schema), table, SAFE_SQL_NTS(table) );
 
 	if (rc == SQL_ERROR) {
@@ -3584,6 +3600,10 @@ PHP_FUNCTION(odbc_specialcolumns)
 		RETURN_FALSE;
 	}
 	
+	if (cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLSpecialColumns(result->stmt, 
 			type,
 			cat, SAFE_SQL_NTS(cat), 
@@ -3653,6 +3673,10 @@ PHP_FUNCTION(odbc_statistics)
 		RETURN_FALSE;
 	}
 	
+	if (cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLStatistics(result->stmt, 
 			cat, SAFE_SQL_NTS(cat),
 			schema, SAFE_SQL_NTS(schema), 
@@ -3716,6 +3740,10 @@ PHP_FUNCTION(odbc_tableprivileges)
 		RETURN_FALSE;
 	}
 	
+	if (cat_len == 0) {
+		cat = NULL;
+	}
+
 	rc = SQLTablePrivileges(result->stmt, 
 			cat, SAFE_SQL_NTS(cat), 
 			schema, SAFE_SQL_NTS(schema),