fix column name attribute with ODBC 3.0

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6945b50f7e6cda685782be38609facda01cdc600..231e8144f9a4861ec11e2e442ff72479704027bb 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -960,7 +960,7 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
                charextraalloc = 0;
                colfieldid = SQL_COLUMN_DISPLAY_SIZE;
 
-               rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_DESC_BASE_COLUMN_NAME,
+               rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_SQL_DESC_NAME,
                                result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
                rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, 
                                NULL, 0, NULL, &result->values[i].coltype);

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 5b61fc3d1ec7218fa2913df98cd330254bda5090..07fe07e7a2c60aef0d249f85e1cab179b69ad7e4 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -285,14 +285,14 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
 #define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttribute
 #define PHP_ODBC_SQLALLOCSTMT(hdbc, phstmt) SQLAllocHandle(SQL_HANDLE_STMT, hdbc, phstmt)
 
-#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME
+#define PHP_ODBC_SQL_DESC_NAME SQL_DESC_NAME
 #else
 #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR)
 
 #define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes
 #define PHP_ODBC_SQLALLOCSTMT SQLAllocStmt
 
-#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_COLUMN_NAME
+#define PHP_ODBC_SQL_DESC_NAME SQL_COLUMN_NAME
 #endif
 #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)