archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Ilia Alshanetsky 2010-06-15 11:13:20 +00:00
parent 8fcd33ed18
commit 24b8bc3489
3 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pdo/pdo_dbh.c
View file

@ -694,11 +694,7 @@ static PHP_METHOD(PDO, inTransaction)
}
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);
}
/* }}} */

1
ext/pdo/php_pdo_driver.h
View file

@ -310,7 +310,6 @@ struct pdo_dbh_methods {
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;
};
/* }}} */

10
ext/pdo_pgsql/pgsql_driver.c
View file

@ -497,15 +497,6 @@ static int pgsql_handle_rollback(pdo_dbh_t *dbh TSRMLS_DC)
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 @@ static struct pdo_dbh_methods pgsql_methods = {
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) /* {{{ */