Merge pull request #103 from AlexeyDsov/innerTransactionUsing

CarefulDatabaseRunner and UnifiedContainer will use InnerTransaction

Author: AlexeyDsov

doc/ChangeLog

@@ -1,3 +1,8 @@
+2012-24-10  Alexey S. Denisov
+	* main/Flow/CarefulDatabaseRunner.class.php
+		main/UnifiedContainer/UnifiedContainer.class.php:
+			CarefulDatabaseRunner and UnifiedContainer will use InnerTransaction
+
 2012-24-10  Alexey S. Denisov
 	* global.inc.php.tpl
 		main/Autoloader/Autoloader.class.php

main/Flow/CarefulDatabaseRunner.class.php

@@ -14,8 +14,11 @@
 	**/
 	final class CarefulDatabaseRunner implements CarefulCommand
 	{
-		private $command	= null;
-		private $db			= null;
+		private $command		= null;
+		/**
+		 * @var InnerTransaction
+		 */
+		private $transaction	= null;
 
 		private $running = false;
 
@@ -33,9 +36,7 @@ public function run(Prototyped $subject, Form $form, HttpRequest $request)
 			Assert::isFalse($this->running, 'command already running');
 			Assert::isTrue($subject instanceof DAOConnected);
 
-			$this->db = DBPool::getByDao($subject->dao());
-			
-			$this->db->begin();
+			$this->transaction = InnerTransaction::begin($subject->dao());
 
 			try {
 				$mav = $this->command->run($subject, $form, $request);
@@ -44,7 +45,7 @@ public function run(Prototyped $subject, Form $form, HttpRequest $request)
 
 				return $mav;
 			} catch (BaseException $e) {
-				$this->db->rollback();
+				$this->transaction->rollback();
 
 				throw $e;
 			}
@@ -58,7 +59,7 @@ public function run(Prototyped $subject, Form $form, HttpRequest $request)
 		public function commit()
 		{
 			if ($this->running) {
-				$this->db->commit();
+				$this->transaction->commit();
 				$this->running = false;
 			}
 
@@ -72,7 +73,7 @@ public function rollback()
 		{
 			if ($this->running) {
 				try {
-					$this->db->rollback();
+					$this->transaction->rollback();
 				} catch (DatabaseException $e) {
 					// keep silence
 				}
@@ -86,11 +87,7 @@ public function rollback()
 		public function __destruct()
 		{
 			if ($this->running) {
-				try {
-					$this->db->rollback();
-				} catch (BaseException $e) {
-					// fear of fatal error's
-				}
+				$this->rollback();
 			}
 		}
 	}

main/UnifiedContainer/UnifiedContainer.class.php

@@ -299,34 +299,10 @@ public function save()
 				}
 			}
 
-			$db = DBPool::getByDao($this->getDao());
-			
-			if (!$db->inTransaction()) {
-				$outerQueue = $db->isQueueActive();
-				
-				if (!$outerQueue)
-					$db->queueStart();
-				
-				$db->begin();
-				
-				try {
-					$this->worker->sync($insert, $update, $delete);
-					
-					$db->commit();
-					
-					if (!$outerQueue)
-						$db->queueFlush();
-				} catch (DatabaseException $e) {
-					if (!$outerQueue)
-						$db->queueDrop()->queueStop();
-					
-					$db->rollback();
-					
-					throw $e;
-				}
-			} else {
-				$this->worker->sync($insert, $update, $delete);
-			}
+			InnerTransactionWrapper::create()->
+				setDao($this->getDao())->
+				setFunction(array($this->worker, 'sync'))->
+				run($insert, $update, $delete);
 
 			$this->clones = array();
 			$this->syncClones();