iliaa                                    Tue, 15 Jun 2010 11:13:20 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300464

Log:
Removed the in_transaction handler for 5.3 to avoid BC break due to structure 
change

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
    U   php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h
    U   php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-06-15 10:50:53 UTC 
(rev 300463)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-06-15 11:13:20 UTC 
(rev 300464)
@@ -694,11 +694,7 @@
        }
        PDO_CONSTRUCT_CHECK;

-       if (!dbh->methods->in_transaction) {
-               RETURN_BOOL(dbh->in_txn);
-       }
-
-       RETURN_LONG(dbh->methods->in_transaction(dbh TSRMLS_CC));
+       RETURN_LONG(dbh->in_txn);
 }
 /* }}} */


Modified: php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h       2010-06-15 
10:50:53 UTC (rev 300463)
+++ php/php-src/branches/PHP_5_3/ext/pdo/php_pdo_driver.h       2010-06-15 
11:13:20 UTC (rev 300464)
@@ -310,7 +310,6 @@
        pdo_dbh_check_liveness_func     check_liveness;
        pdo_dbh_get_driver_methods_func get_driver_methods;
        pdo_dbh_request_shutdown        persistent_shutdown;
-       pdo_dbh_txn_func                in_transaction;
 };

 /* }}} */

Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2010-06-15 
10:50:53 UTC (rev 300463)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2010-06-15 
11:13:20 UTC (rev 300464)
@@ -497,15 +497,6 @@
        return pdo_pgsql_transaction_cmd("ROLLBACK", dbh TSRMLS_CC);
 }

-static int pgsql_handle_in_transaction(pdo_dbh_t *dbh TSRMLS_DC)
-{
-       pdo_pgsql_db_handle *H;
-
-       H = (pdo_pgsql_db_handle *)dbh->driver_data;
-
-       return PQtransactionStatus(H->server);
-}
-
 /* {{{ proto string PDO::pgsqlCopyFromArray(string $table_name , array $rows 
[, string $delimiter [, string $null_as ] [, string $fields])
    Returns true if the copy worked fine or false if error */
 static PHP_METHOD(PDO, pgsqlCopyFromArray)
@@ -1031,7 +1022,6 @@
        pdo_pgsql_check_liveness,       /* check_liveness */
        pdo_pgsql_get_driver_methods,  /* get_driver_methods */
        NULL,
-       pgsql_handle_in_transaction,
 };

 static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options 
TSRMLS_DC) /* {{{ */

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

Reply via email to