diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-03 13:32:05 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-03 13:32:05 +0200 |
| commit | e75cf6b7e4fa291a99c97b6f6b77fca904d5569a (patch) | |
| tree | ab13575e4acb578e2a52917500038e4afabd6a93 /ext/odbc | |
| parent | 02df0cb02b5763216de4a18884e0fd0bfdb52174 (diff) | |
| parent | 344ff5dd4c538eaebea075f7705321f8b86d0b47 (diff) | |
| download | php-git-e75cf6b7e4fa291a99c97b6f6b77fca904d5569a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed fix #69975 wrt. ODBCVER < 0x0300
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/php_odbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 3451140fc3..11fecbd617 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1013,14 +1013,14 @@ int odbc_bindcols(odbc_result *result) rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE, NULL, 0, NULL, &displaysize); } -#endif + /* Workaround for drivers that report NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0 (bug #69975) */ if (result->values[i].coltype == SQL_WVARCHAR && displaysize == 0) { result->values[i].coltype = SQL_WLONGVARCHAR; result->values[i].value = NULL; break; } - +#endif /* Workaround for Oracle ODBC Driver bug (#50162) when fetching TIMESTAMP column */ if (result->values[i].coltype == SQL_TIMESTAMP) { displaysize += 3; |