[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_stmt.c

[Wez Furlong]

wez             Thu Jul  7 10:20:05 2005 EDT

  Modified files:              
    /php-src/ext/pdo_odbc       odbc_stmt.c 
  Log:
  DB2 wants us to use the proper ODBC 3 function for closing a cursor.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_stmt.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/pdo_odbc/odbc_stmt.c
diff -u php-src/ext/pdo_odbc/odbc_stmt.c:1.21 
php-src/ext/pdo_odbc/odbc_stmt.c:1.22
--- php-src/ext/pdo_odbc/odbc_stmt.c:1.21       Thu Jul  7 08:49:21 2005
+++ php-src/ext/pdo_odbc/odbc_stmt.c    Thu Jul  7 10:20:04 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: odbc_stmt.c,v 1.21 2005/07/07 12:49:21 wez Exp $ */
+/* $Id: odbc_stmt.c,v 1.22 2005/07/07 14:20:04 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -51,7 +51,7 @@
 
        if (S->stmt != SQL_NULL_HANDLE) {
                if (stmt->executed) {
-                       SQLCancel(S->stmt);
+                       SQLCloseCursor(S->stmt);
                }
                SQLFreeHandle(SQL_HANDLE_STMT, S->stmt);
                S->stmt = SQL_NULL_HANDLE;
@@ -71,7 +71,7 @@
        char *buf = NULL;
 
        if (stmt->executed) {
-               SQLCancel(S->stmt);
+               SQLCloseCursor(S->stmt);
        }
        
        rc = SQLExecute(S->stmt);       
@@ -93,7 +93,7 @@
                        if (!stm) {
                                /* shouldn't happen either */
                                pdo_odbc_stmt_error("input LOB is no longer a 
stream");
-                               SQLCancel(S->stmt);
+                               SQLCloseCursor(S->stmt);
                                if (buf) {
                                        efree(buf);
                                }
@@ -359,7 +359,7 @@
        }
 
        if (rc == SQL_NO_DATA) {
-               pdo_odbc_stmt_error("SQLFetchScroll");
+               /* pdo_odbc_stmt_error("SQLFetchScroll"); */
                return 0;
        }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php