InnerTransaction

core/DB/DB.class.php

@@ -35,6 +35,10 @@ abstract class DB
 		 * flag to indicate whether we're in transaction
 		**/
 		private $transaction	= false;
+		/**
+		 * @var list of all started savepoints
+		 */
+		private $savepointList	= array();
 
 		private $queue			= array();
 		private $toQueue		= false;
@@ -140,6 +144,7 @@ public function commit()
 				$this->queryRaw("commit;\n");
 
 			$this->transaction = false;
+			$this->savepointList = array();
 
 			return $this;
 		}
@@ -155,6 +160,7 @@ public function rollback()
 				$this->queryRaw("rollback;\n");
 
 			$this->transaction = false;
+			$this->savepointList = array();
 
 			return $this;
 		}
@@ -222,6 +228,69 @@ public function isQueueActive()
 		}
 		//@}
 
+		/**
+		 * @param string $savepointName
+		 * @return DB 
+		 */
+		public function savepointBegin($savepointName)
+		{
+			$this->assertSavePointName($savepointName);
+			if (!$this->inTransaction())
+				throw new DatabaseException('To use savepoint begin transaction first');
+
+			$query = 'savepoint '.$savepointName;
+			if ($this->toQueue)
+				$this->queue[] = $query;
+			else
+				$this->queryRaw("{$query};\n");
+
+			return $this->addSavepoint($savepointName);
+		}
+
+		/**
+		 * @param string $savepointName
+		 * @return DB 
+		 */
+		public function savepointRelease($savepointName)
+		{
+			$this->assertSavePointName($savepointName);
+			if (!$this->inTransaction())
+				throw new DatabaseException('To release savepoint need first begin transaction');
+
+			if (!$this->checkSavepointExist($savepointName))
+				throw new DatabaseException("savepoint with name '{$savepointName}' nor registered");
+
+			$query = 'release savepoint '.$savepointName;
+			if ($this->toQueue)
+				$this->queue[] = $query;
+			else
+				$this->queryRaw("{$query};\n");
+
+			return $this->dropSavepoint($savepointName);
+		}
+
+		/**
+		 * @param string $savepointName
+		 * @return DB 
+		 */
+		public function savepointRollback($savepointName)
+		{
+			$this->assertSavePointName($savepointName);
+			if (!$this->inTransaction())
+				throw new DatabaseException('To rollback savepoint need first begin transaction');
+
+			if (!$this->checkSavepointExist($savepointName))
+				throw new DatabaseException("savepoint with name '{$savepointName}' nor registered");
+
+			$query = 'rollback to savepoint '.$savepointName;
+			if ($this->toQueue)
+				$this->queue[] = $query;
+			else
+				$this->queryRaw("{$query};\n");
+
+			return $this->dropSavepoint($savepointName);
+		}
+
 		/**
 		 * base queries
 		**/
@@ -331,5 +400,41 @@ public function setEncoding($encoding)
 
 			return $this;
 		}
+
+		/**
+		 * @param string $savepointName 
+		 * @return DB
+		 */
+		private function addSavepoint($savepointName)
+		{
+			if ($this->checkSavepointExist($savepointName))
+				throw new DatabaseException("savepoint with name '{$savepointName}' already marked");
+
+			$this->savepointList[$savepointName] = true;
+			return $this;
+		}
+
+		/**
+		 * @param string $savepointName 
+		 * @return DB
+		 */
+		private function dropSavepoint($savepointName)
+		{
+			if (!$this->checkSavepointExist($savepointName))
+				throw new DatabaseException("savepoint with name '{$savepointName}' nor registered");
+
+			unset($this->savepointList[$savepointName]);
+			return $this;
+		}
+
+		private function checkSavepointExist($savepointName)
+		{
+			return isset($this->savepointList[$savepointName]);
+		}
+
+		private function assertSavePointName($savepointName)
+		{
+			Assert::isEqual(1, preg_match('~^[A-Za-z][A-Za-z0-9]*$~iu', $savepointName));
+		}
 	}
 ?>

core/DB/Transaction/InnerTransaction.class.php

@@ -0,0 +1,113 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Alexey S. Denisov                               *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * Utility to create transaction and not think about current nested level
+	 * 
+	 * @ingroup Transaction
+	**/
+	final class InnerTransaction
+	{
+		/**
+		 * @var DB
+		**/
+		private $db = null;
+		private $savepointName = null;
+		private $finished = false;
+
+		/**
+		 * @param DB|GenericDAO $database
+		 * @param IsolationLevel $level
+		 * @param AccessMode $mode
+		 * @return InnerTransaction
+		**/
+		public static function begin(
+			$database,
+			IsolationLevel $level = null,
+			AccessMode $mode = null
+		)
+		{
+			return new self($database, $level, $mode);
+		}
+
+		/**
+		 * @param DB|GenericDAO $database
+		 * @param IsolationLevel $level
+		 * @param AccessMode $mode
+		**/
+		public function __construct(
+			$database,
+			IsolationLevel $level = null,
+			AccessMode $mode = null
+		)
+		{
+			if ($database instanceof DB) {
+				$this->db = $database;
+			} elseif ($database instanceof GenericDAO) {
+				$this->db = DBPool::getByDao($database);
+			} else {
+				throw new WrongStateException(
+					'$database must be instance of DB or GenericDAO'
+				);
+			}
+
+			$this->beginTransaction($level, $mode);
+		}
+
+		public function commit()
+		{
+			$this->assertFinished();
+			$this->finished = true;
+			if (!$this->savepointName) {
+				$this->db->commit();
+			} else {
+				$this->db->savepointRelease($this->savepointName);
+			}
+		}
+
+		public function rollback()
+		{
+			$this->assertFinished();
+			$this->finished = true;
+			if (!$this->savepointName) {
+				$this->db->rollback();
+			} else {
+				$this->db->savepointRollback($this->savepointName);
+			}
+		}
+
+		private function beginTransaction(
+			IsolationLevel $level = null,
+			AccessMode $mode = null
+		)
+		{
+			$this->assertFinished();
+			if (!$this->db->inTransaction()) {
+				$this->db->begin($level, $mode);
+			} else {
+				$this->savepointName = $this->createSavepointName();
+				$this->db->savepointBegin($this->savepointName);
+			}
+		}
+
+		private function assertFinished()
+		{
+			if ($this->finished)
+				throw new WrongStateException('This Transaction already finished');
+		}
+
+		private static function createSavepointName()
+		{
+			static $i = 1;
+			return 'innerSavepoint'.($i++);
+		}
+	}
+?>

core/DB/Transaction/InnerTransactionWrapper.class.php

@@ -0,0 +1,134 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2012 by Alexey S. Denisov                               *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * Utility to wrap function into transaction
+	 * 
+	 * @ingroup Transaction
+	**/
+	final class InnerTransactionWrapper
+	{
+		/**
+		 * @var DB
+		 */
+		private $db = null;
+		/**
+		 * @var StorableDAO
+		 */
+		private $dao = null;
+		private $function = null;
+		private $exceptionFunction = null;
+		/**
+		 * @var IsolationLevel
+		 */
+		private $level = null;
+		/**
+		 * @var AccessMode
+		 */
+		private $mode = null;
+
+		/**
+		 * @return InnerTransactionWrapper
+		 */
+		public static function create()
+		{
+			return new self;
+		}
+
+		/**
+		 * @param DB $db
+		 * @return InnerTransactionWrapper
+		 */
+		public function setDB(DB $db)
+		{
+			$this->db = $db;
+			return $this;
+		}
+
+		/**
+		 * @param StorableDAO $dao
+		 * @return InnerTransactionWrapper
+		 */
+		public function setDao(StorableDAO $dao)
+		{
+			$this->dao = $dao;
+			return $this;
+		}
+
+		/**
+		 * @param collable $function
+		 * @return InnerTransactionWrapper
+		 */
+		public function setFunction($function)
+		{
+			Assert::isTrue(is_callable($function, false), '$function must be callable');
+			$this->function = $function;
+			return $this;
+		}
+
+		/**
+		 * @param collable $function
+		 * @return InnerTransactionWrapper
+		 */
+		public function setExceptionFunction($function)
+		{
+			Assert::isTrue(is_callable($function, false), '$function must be callable');
+			$this->exceptionFunction = $function;
+			return $this;
+		}
+
+		/**
+		 * @param IsolationLevel $level
+		 * @return InnerTransactionWrapper
+		 */
+		public function setLevel(IsolationLevel $level)
+		{
+			$this->level = $level;
+			return $this;
+		}
+
+		/**
+		 * @param AccessMode $mode
+		 * @return InnerTransactionWrapper
+		 */
+		public function setMode(AccessMode $mode)
+		{
+			$this->mode = $mode;
+			return $this;
+		}
+
+		public function run()
+		{
+			Assert::isTrue(!is_null($this->dao) || !is_null($this->db), 'set first dao or db');
+			Assert::isNotNull($this->function, 'set first function');
+
+			$transaction = InnerTransaction::begin(
+				$this->dao ?: $this->db,
+				$this->level,
+				$this->mode
+			);
+
+			try {
+				$result = call_user_func_array($this->function, func_get_args());
+				$transaction->commit();
+				return $result;
+			} catch (Exception $e) {
+				$transaction->rollback();
+				if ($this->exceptionFunction) {
+					$args = func_get_args();
+					array_unshift($args, $e);
+					return call_user_func_array($this->exceptionFunction, $args);
+				}
+				throw $e;
+			}
+		}
+	}
+?>

test/config.inc.php.tpl

@@ -37,7 +37,7 @@
 			'host'	=> '127.0.0.1',
 			'base'	=> 'onphp'
 		),
-		'SQLite' => array(
+		'SQLitePDO' => array(
 			'user'	=> 'onphp',
 			'pass'	=> 'onphp',
 			'host'	=> '127.0.0.1',