From 5c2aa71e0c439afda4d7f4464a9f19221dbb667d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 2 Apr 2015 14:23:23 +0200 Subject: more compliance with the ODBC 3.0 --- ext/odbc/php_odbc_includes.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ext/odbc/php_odbc_includes.h') diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 15bb737a8b..181688ae7f 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -281,8 +281,10 @@ 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 #else #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR) +#define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes #endif #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY) -- cgit v1.2.1 From d27d9158c91a8db82e4d3d69dd8f4ed2701101eb Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 2 Apr 2015 15:30:31 +0200 Subject: further ODBC 3.0 compliance --- ext/odbc/php_odbc_includes.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ext/odbc/php_odbc_includes.h') diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 181688ae7f..5f0c205977 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) -- cgit v1.2.1