diff options
| -rw-r--r-- | includes/database/database.inc | 2 | ||||
| -rw-r--r-- | includes/database/query.inc | 3 | ||||
| -rw-r--r-- | modules/simpletest/tests/database_test.test | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index 669245629..2ca7747ac 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -851,7 +851,7 @@ abstract class DatabaseConnection extends PDO { if ($this->transactionLayers == 1) { if ($this->supportsTransactions()) { - parent::startTransaction(); + parent::beginTransaction(); } // Reset any scheduled rollback diff --git a/includes/database/query.inc b/includes/database/query.inc index c8e312dec..57a9e6738 100644 --- a/includes/database/query.inc +++ b/includes/database/query.inc @@ -690,8 +690,7 @@ class MergeQuery extends Query { $this->connection->insert($this->table, $this->queryOptions)->fields($insert_fields)->execute(); } - // Commit the transaction. - $transaction->commit(); + // Transaction commits here where $transaction looses scope. } public function __toString() { diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index 222aa3e10..5df638346 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -2255,8 +2255,8 @@ class DatabaseTransactionTestCase extends DatabaseTestCase { // on a database that does not actually support transactions, and // the current database does claim to NOT support transactions. $txn = db_transaction(TRUE); + $this->fail('No transaction failure registered.'); } - $this->fail('No transaction failure registered.'); } catch (TransactionsNotSupportedException $e) { $this->pass('Exception thrown for unsupported transactions.'); |