more compliance with the ODBC 3.x

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6a2db5581c79e7e28eecfec12f5a58deef8685ca..cc8a7f62dcf186d966a417e718918d988a6babdf 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -954,9 +954,9 @@ int odbc_bindcols(odbc_result *result)
                charextraalloc = 0;
                colfieldid = SQL_COLUMN_DISPLAY_SIZE;
 
-               rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_NAME, 
+               rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_NAME, 
                                result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
-               rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, 
+               rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, 
                                NULL, 0, NULL, &result->values[i].coltype);
                
                /* Don't bind LONG / BINARY columns, so that fetch behaviour can
@@ -991,7 +991,7 @@ int odbc_bindcols(odbc_result *result)
                                charextraalloc = 1;
 #endif
                        default:
-                               rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), colfieldid,
+                               rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), colfieldid,
                                                                NULL, 0, NULL, &displaysize);
                                /* Workaround for Oracle ODBC Driver bug (#50162) when fetching TIMESTAMP column */
                                if (result->values[i].coltype == SQL_TIMESTAMP) {
@@ -1089,7 +1089,7 @@ void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
                RETURN_FALSE;
        }
 
-       SQLColAttributes(result->stmt, (SQLUSMALLINT)pv_num, (SQLUSMALLINT) (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
+       PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, (SQLUSMALLINT) (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
 
        RETURN_LONG(len);
 }
@@ -2135,7 +2135,7 @@ PHP_FUNCTION(odbc_result)
                                   fieldsize = result->longreadlen;
                                }
                        } else {
-                          SQLColAttributes(result->stmt, (SQLUSMALLINT)(field_ind + 1), 
+                          PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(field_ind + 1), 
                                                                (SQLUSMALLINT)((sql_c_type == SQL_C_BINARY) ? SQL_COLUMN_LENGTH :
                                                                SQL_COLUMN_DISPLAY_SIZE),
                                                                NULL, 0, NULL, &fieldsize);
@@ -2890,7 +2890,7 @@ PHP_FUNCTION(odbc_field_type)
                RETURN_FALSE;
        }
 
-       SQLColAttributes(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
+       PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
        RETURN_STRING(tmp)
 }
 /* }}} */

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index e1ddcec7650a5d0c78b9d41f4caaa9d5f3b08a7e..3c6474392240862c8bef6777922ef6124154bdb4 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -281,8 +281,10 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
 
 #if defined(ODBCVER) && (ODBCVER >= 0x0300)
 #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR || x == SQL_WLONGVARCHAR)
+#define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttribute
 #else
 #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR)
+#define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes
 #endif
 #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)