summaryrefslogtreecommitdiff
path: root/ext/odbc/php_odbc.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2015-07-03 13:30:39 +0200
committerChristoph M. Becker <cmb@php.net>2015-07-03 13:30:39 +0200
commit344ff5dd4c538eaebea075f7705321f8b86d0b47 (patch)
treec00f62de076d79d98511952393f186b253a4ecf6 /ext/odbc/php_odbc.c
parentd870683d6b37884bd4baf9a3aa5cd3e43a3c432a (diff)
downloadphp-git-344ff5dd4c538eaebea075f7705321f8b86d0b47.tar.gz
fixed fix #69975 wrt. ODBCVER < 0x0300
Diffstat (limited to 'ext/odbc/php_odbc.c')
-rw-r--r--ext/odbc/php_odbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 80af492638..1d70b7fd19 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1007,14 +1007,14 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
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;