tonyair/silverstripe-postgresql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-postgresql synced 2024-06-21 20:19:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83 from dhensby/pulls/2.0/nested-transactions

Browse Source 
FIX Allow nested transactions
This commit is contained in:
Damian Mooyman 2018-02-09 09:50:46 +13:00 committed by GitHub
commit 2bbd73620d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
code/PostgreSQLDatabase.php
View File

@ -36,6 +36,11 @@ class PostgreSQLDatabase extends Database
*/
protected $schema;
/**
* @var bool
*/
protected $transactionNesting = 0;
/**
* Toggle if transactions are supported. Defaults to true.
*
@ -519,15 +524,20 @@ class PostgreSQLDatabase extends Database
public function transactionStart($transaction_mode = false, $session_characteristics = false)
{
$this->query('BEGIN;');
if ($this->transactionNesting > 0) {
$this->transactionSavepoint('NESTEDTRANSACTION' . $this->transactionNesting);
} else {
$this->query('BEGIN;');
if ($transaction_mode) {
$this->query("SET TRANSACTION {$transaction_mode};");
}
if ($transaction_mode) {
$this->query("SET TRANSACTION {$transaction_mode};");
}
if ($session_characteristics) {
$this->query("SET SESSION CHARACTERISTICS AS TRANSACTION {$session_characteristics};");
if ($session_characteristics) {
$this->query("SET SESSION CHARACTERISTICS AS TRANSACTION {$session_characteristics};");
}
}
++$this->transactionNesting;
}
public function transactionSavepoint($savepoint)
@ -538,15 +548,24 @@ class PostgreSQLDatabase extends Database
public function transactionRollback($savepoint = false)
{
if ($savepoint) {
$this->query("ROLLBACK TO {$savepoint};");
$this->query('ROLLBACK TO ' . $savepoint);
} else {
$this->query('ROLLBACK;');
--$this->transactionNesting;
if ($this->transactionNesting > 0) {
$this->transactionRollback('NESTEDTRANSACTION' . $this->transactionNesting);
} else {
$this->query('ROLLBACK');
}
}
}
public function transactionEnd($chain = false)
{
$this->query('COMMIT;');
--$this->transactionNesting;
if ($this->transactionNesting <= 0) {
$this->transactionNesting = 0;
$this->query('COMMIT;');
}
}
public function comparisonClause($field, $value, $exact = false, $negate = false, $caseSensitive = null, $parameterised = false)