rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a few nested transaction cleanups

Browse Source 
functionality for committing/rolling back all active transactions
This commit is contained in:
Sergey Tsalkov
2012-09-18 20:54:39 -07:00
parent 24c1b930df
commit 9a41bf34a1
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
db.class.php
View File

@@ -215,14 +215,16 @@ class MeekroDB {
if (!$this->nested_transactions || $this->nested_transactions_count == 0) { if (!$this->nested_transactions || $this->nested_transactions_count == 0) {
$this->queryNull('START TRANSACTION'); $this->queryNull('START TRANSACTION');
$this->nested_transactions_count = 1;
} else { } else {
$this->queryNull("SAVEPOINT LEVEL{$this->nested_transactions_count}"); $this->queryNull("SAVEPOINT LEVEL{$this->nested_transactions_count}");
$this->nested_transactions_count++;
} }
if ($this->nested_transactions) return ++$this->nested_transactions_count; return $this->nested_transactions_count;
} }
public function commit() { public function commit($all=false) {
if ($this->nested_transactions && $this->serverVersion() < '5.5') { if ($this->nested_transactions && $this->serverVersion() < '5.5') {
return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion()); return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
} }
@@ -230,7 +232,8 @@ class MeekroDB {
if ($this->nested_transactions && $this->nested_transactions_count > 0) if ($this->nested_transactions && $this->nested_transactions_count > 0)
$this->nested_transactions_count--; $this->nested_transactions_count--;
if (!$this->nested_transactions || $this->nested_transactions_count == 0) { if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
$this->nested_transactions_count = 0;
$this->queryNull('COMMIT'); $this->queryNull('COMMIT');
} else { } else {
$this->queryNull("RELEASE SAVEPOINT LEVEL{$this->nested_transactions_count}"); $this->queryNull("RELEASE SAVEPOINT LEVEL{$this->nested_transactions_count}");
@@ -239,7 +242,7 @@ class MeekroDB {
return $this->nested_transactions_count; return $this->nested_transactions_count;
} }
public function rollback() { public function rollback($all=false) {
if ($this->nested_transactions && $this->serverVersion() < '5.5') { if ($this->nested_transactions && $this->serverVersion() < '5.5') {
return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion()); return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
} }
@@ -247,7 +250,8 @@ class MeekroDB {
if ($this->nested_transactions && $this->nested_transactions_count > 0) if ($this->nested_transactions && $this->nested_transactions_count > 0)
$this->nested_transactions_count--; $this->nested_transactions_count--;
if (!$this->nested_transactions || $this->nested_transactions_count == 0) { if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
$this->nested_transactions_count = 0;
$this->queryNull('ROLLBACK'); $this->queryNull('ROLLBACK');
} else { } else {
$this->queryNull("ROLLBACK TO SAVEPOINT LEVEL{$this->nested_transactions_count}"); $this->queryNull("ROLLBACK TO SAVEPOINT LEVEL{$this->nested_transactions_count}");

14
simpletest/TransactionTest.php
View File

@@ -5,16 +5,22 @@ class TransactionTest extends SimpleTest {
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe'); DB::query("UPDATE accounts SET age=%i WHERE username=%s", 600, 'Abe');
DB::startTransaction(); $depth = DB::startTransaction();
$this->assert($depth === 1);
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe'); DB::query("UPDATE accounts SET age=%i WHERE username=%s", 700, 'Abe');
DB::startTransaction(); $depth = DB::startTransaction();
$this->assert($depth === 1);
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe'); DB::query("UPDATE accounts SET age=%i WHERE username=%s", 800, 'Abe');
DB::rollback(); $depth = DB::rollback();
$this->assert($depth === 0);
$age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe'); $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
$this->assert($age == 700); $this->assert($age == 700);
DB::rollback(); $depth = DB::rollback();
$this->assert($depth === 0);
$age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe'); $age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
$this->assert($age == 700); $this->assert($age == 700);

21
simpletest/TransactionTest_55.php
View File

@@ -59,5 +59,26 @@ class TransactionTest_55 extends SimpleTest {
DB::$nested_transactions = false; DB::$nested_transactions = false;
} }
function test_3_transaction_rollback_all() {
DB::$nested_transactions = true;
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 200, 'Abe');
$depth = DB::startTransaction();
$this->assert($depth === 1);
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 300, 'Abe');
$depth = DB::startTransaction();
$this->assert($depth === 2);
DB::query("UPDATE accounts SET age=%i WHERE username=%s", 400, 'Abe');
$depth = DB::rollback(true);
$this->assert($depth === 0);
$age = DB::queryFirstField("SELECT age FROM accounts WHERE username=%s", 'Abe');
$this->assert($age == 200);
DB::$nested_transactions = false;
}
} }
?> ?>