Skip to content

Commit e09febb

Browse files
committed
fix column name attribute with ODBC 3.0
1 parent db1596c commit e09febb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/odbc/php_odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
960960
charextraalloc = 0;
961961
colfieldid = SQL_COLUMN_DISPLAY_SIZE;
962962

963-
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_DESC_BASE_COLUMN_NAME,
963+
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_SQL_DESC_NAME,
964964
result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
965965
rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE,
966966
NULL, 0, NULL, &result->values[i].coltype);

ext/odbc/php_odbc_includes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
285285
#define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttribute
286286
#define PHP_ODBC_SQLALLOCSTMT(hdbc, phstmt) SQLAllocHandle(SQL_HANDLE_STMT, hdbc, phstmt)
287287

288-
#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME
288+
#define PHP_ODBC_SQL_DESC_NAME SQL_DESC_NAME
289289
#else
290290
#define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR)
291291

292292
#define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes
293293
#define PHP_ODBC_SQLALLOCSTMT SQLAllocStmt
294294

295-
#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_COLUMN_NAME
295+
#define PHP_ODBC_SQL_DESC_NAME SQL_COLUMN_NAME
296296
#endif
297297
#define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
298298

0 commit comments

Comments
 (0)