diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-01-11 07:47:03 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-01-11 07:47:03 +0000 |
| commit | f088ccfb98b4108ba7825bee976f03b86daf7107 (patch) | |
| tree | 09f5578790d55435e74eb6ea7148f2317d4261a2 /includes | |
| parent | 7b5392b9028bd84d200e7dfff9ef273d6eb82313 (diff) | |
| download | brdo-f088ccfb98b4108ba7825bee976f03b86daf7107.tar.gz brdo-f088ccfb98b4108ba7825bee976f03b86daf7107.tar.bz2 | |
- Patch #301049 by Josh Waihi, Damien Tournoud, et al: fixed bug with transaction support (on PostgreSQL).
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database/database.inc | 2 | ||||
| -rw-r--r-- | includes/database/query.inc | 3 |
2 files changed, 2 insertions, 3 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() { |