Doctrine

Timestamp:

03/20/08 15:11:33 (16 months ago)

Author:

romanb

Message:

Fixed #873

Location:

branches/0.10/lib/Doctrine

Files:

• Transaction.php (modified) (4 diffs)
• Transaction/Mssql.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Transaction.php

@@ -203 +203 @@
                 if ( ! $event->skipOperation) {
                     try {
-                        $this->conn->getDbh()->beginTransaction();
+                        $this->_doBeginTransaction();
                     } catch (Exception $e) {
                         throw new Doctrine_Transaction_Exception($e->getMessage());
@@ -276 +276 @@
                     $listener->preTransactionCommit($event);
                     if ( ! $event->skipOperation) {
-                        $this->conn->getDbh()->commit();
+                        $this->_doCommit();
                     }
                     $listener->postTransactionCommit($event);
@@ -350 +350 @@
                 $this->_internalNestingLevel = 0;
                 try {
-                    $this->conn->getDbh()->rollback();
+                    $this->_doRollback();
                 } catch (Exception $e) {
                     throw new Doctrine_Transaction_Exception($e->getMessage());
@@ -396 +396 @@
     {
         throw new Doctrine_Transaction_Exception('Savepoints not supported by this driver.');
+    }
+    
+    /**
+     * Performs the rollback.
+     */
+    protected function _doRollback()
+    {
+        $this->conn->getDbh()->rollback();
+    }
+    
+    /**
+     * Performs the commit.
+     */
+    protected function _doCommit()
+    {
+        $this->conn->getDbh()->commit();
+    }
+    
+    /**
+     * Begins a database transaction.
+     */
+    protected function _doBeginTransaction()
+    {
+        $this->conn->getDbh()->beginTransaction();
     }
 

branches/0.10/lib/Doctrine/Transaction/Mssql.php

@@ -66 +66 @@
         $this->conn->execute($query);
     }
+    
+    /**
+     * Performs the rollback.
+     */
+    protected function _doRollback()
+    {
+        $this->conn->getDbh()->exec('ROLLBACK TRANSACTION');
+    }
+    
+    /**
+     * Performs the commit.
+     */
+    protected function _doCommit()
+    {
+        $this->conn->getDbh()->exec('COMMIT TRANSACTION');
+    }
+    
+    /**
+     * Begins a database transaction.
+     */
+    protected function _doBeginTransaction()
+    {
+        $this->conn->getDbh()->exec('BEGIN TRANSACTION');
+    }
 }