--- php-5.2.3/ext/odbc/php_odbc.c	2007-03-13 01:04:38.000000000 +0100
+++ php-5.2.3-oracle_compat/ext/odbc/php_odbc.c	2007-08-25 15:04:07.000000000 +0200
@@ -2947,6 +2947,11 @@
 	 */
 	if (table && strlen(table) && schema && !strlen(schema)) schema = NULL;
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLColumns(result->stmt, 
 			cat, cat_len,
 			schema, schema_len,
@@ -3022,6 +3027,11 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLColumnPrivileges(result->stmt, 
 			cat, SAFE_SQL_NTS(cat),
 			schema, SAFE_SQL_NTS(schema),
@@ -3116,6 +3126,12 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (pcat && !strlen(pcat)) pcat = NULL;
+	if (fcat && !strlen(fcat)) fcat = NULL;
+
 	rc = SQLForeignKeys(result->stmt, 
 			pcat, SAFE_SQL_NTS(pcat), 
 			pschema, SAFE_SQL_NTS(pschema), 
@@ -3259,6 +3275,11 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLPrimaryKeys(result->stmt, 
 			cat, SAFE_SQL_NTS(cat), 
 			schema, SAFE_SQL_NTS(schema), 
@@ -3497,6 +3518,11 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLSpecialColumns(result->stmt, 
 			type,
 			cat, SAFE_SQL_NTS(cat), 
@@ -3578,6 +3604,11 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLStatistics(result->stmt, 
 			cat, SAFE_SQL_NTS(cat),
 			schema, SAFE_SQL_NTS(schema), 
@@ -3652,6 +3683,11 @@
 		RETURN_FALSE;
 	}
 
+        /*
+         * Needed to make Oracle happy (Johann Hanne)
+         */
+	if (cat && !strlen(cat)) cat = NULL;
+
 	rc = SQLTablePrivileges(result->stmt, 
 			cat, SAFE_SQL_NTS(cat), 
 			schema, SAFE_SQL_NTS(schema),