diff options
| author | Anatol Belski <ab@php.net> | 2015-04-04 21:50:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-04 21:50:18 +0200 |
| commit | b1997278fdb71837ca81f092708fc05108bbfc9c (patch) | |
| tree | 8f48c9b4604e33032528aa1d06ad86f9493137db /ext/odbc/php_odbc_includes.h | |
| parent | baf5fdf59863b75917cee1d65d632e9dc8c6d6a6 (diff) | |
| parent | 8751e0fe719f90863354917dcd493f3a4b18ab02 (diff) | |
| download | php-git-b1997278fdb71837ca81f092708fc05108bbfc9c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added test for bug #69354
revert skipif, this should run everywhere
further ODBC 3.0 compliance
more compliance with the ODBC 3.0
test fixes
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 15bb737a8b..5f0c205977 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -281,8 +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) |