diff options
| author | Anatol Belski <ab@php.net> | 2015-04-02 15:30:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-02 20:19:23 +0200 |
| commit | 899362db6ed3131ff96f07e2d2b7f77c76ce9c40 (patch) | |
| tree | 2a521096296e9ae60e779e383134ec68cbf94936 | |
| parent | b3a027d6103b69bb935431dbec2e59eb20454862 (diff) | |
| download | php-git-899362db6ed3131ff96f07e2d2b7f77c76ce9c40.tar.gz | |
further ODBC 3.0 compliance
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index cc8a7f62dc..322ec95777 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -954,7 +954,7 @@ int odbc_bindcols(odbc_result *result) charextraalloc = 0; colfieldid = SQL_COLUMN_DISPLAY_SIZE; - rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_NAME, + rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), PHP_ODBC_DESC_BASE_COLUMN_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 3c64743922..f9853a6c15 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -281,10 +281,16 @@ 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 + +#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME #else #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR) + #define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes + +#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_COLUMN_NAME #endif #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY) |