diff options
| author | Anatol Belski <ab@php.net> | 2015-04-17 17:13:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-04-17 17:13:45 +0200 |
| commit | 042fa25896a4ff04bf004d6f21c84a3aa30a4e91 (patch) | |
| tree | 38385d24e24bf3242f6f91c6fe99273b17182392 /ext/odbc/php_odbc_includes.h | |
| parent | 342acbe1c6f1c01ef994cd1084165967fc6618a7 (diff) | |
| parent | e09febb286b08a0a7bdbd8a63435eac8963906c4 (diff) | |
| download | php-git-042fa25896a4ff04bf004d6f21c84a3aa30a4e91.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix column name attribute with ODBC 3.0
migrate SQLAllocStmt for ODBC 3.0 compliance
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 5f0c205977..07fe07e7a2 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -283,14 +283,16 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS); #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR || x == SQL_WLONGVARCHAR) #define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttribute +#define PHP_ODBC_SQLALLOCSTMT(hdbc, phstmt) SQLAllocHandle(SQL_HANDLE_STMT, hdbc, phstmt) -#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_DESC_BASE_COLUMN_NAME +#define PHP_ODBC_SQL_DESC_NAME SQL_DESC_NAME #else #define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR) #define PHP_ODBC_SQLCOLATTRIBUTE SQLColAttributes +#define PHP_ODBC_SQLALLOCSTMT SQLAllocStmt -#define PHP_ODBC_DESC_BASE_COLUMN_NAME SQL_COLUMN_NAME +#define PHP_ODBC_SQL_DESC_NAME SQL_COLUMN_NAME #endif #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY) |