migrate SQLAllocStmt for ODBC 3.0 compliance

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 0606eba2a4dae87e1a2f38c37778e6b3c9df9d4f..6945b50f7e6cda685782be38609facda01cdc600 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1181,7 +1181,7 @@ PHP_FUNCTION(odbc_prepare)
        
        result->numparams = 0;
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -1609,7 +1609,7 @@ PHP_FUNCTION(odbc_exec)
                
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
 
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
                efree(result);
@@ -3110,7 +3110,7 @@ PHP_FUNCTION(odbc_tables)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3177,7 +3177,7 @@ PHP_FUNCTION(odbc_columns)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3247,7 +3247,7 @@ PHP_FUNCTION(odbc_columnprivileges)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3323,7 +3323,7 @@ PHP_FUNCTION(odbc_foreignkeys)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3389,7 +3389,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3446,7 +3446,7 @@ PHP_FUNCTION(odbc_primarykeys)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3512,7 +3512,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3579,7 +3579,7 @@ PHP_FUNCTION(odbc_procedures)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3647,7 +3647,7 @@ PHP_FUNCTION(odbc_specialcolumns)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3716,7 +3716,7 @@ PHP_FUNCTION(odbc_statistics)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
@@ -3779,7 +3779,7 @@ PHP_FUNCTION(odbc_tableprivileges)
 
        result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
        
-       rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+       rc = PHP_ODBC_SQLALLOCSTMT(conn->hdbc, &(result->stmt));
        if (rc == SQL_INVALID_HANDLE) {
                efree(result);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 5f0c205977d4d29bb5fc0d226ed7559b8ec485a6..5b61fc3d1ec7218fa2913df98cd330254bda5090 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -283,12 +283,14 @@ 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
 #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
 #endif