Changeset 2399

Timestamp:

03/12/2008 01:15:01 PM (10 months ago)

Author:

xue

Message:

fixed #741.

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/Data/TDbConnection.php (modified) (3 diffs)

trunk/HISTORY

@@ -23 +23 @@
 CHG: Active Record no longer automatically performs adding/removing/updating related objects (Qiang)
 CHG: TJavaScript::encode() will encode data as a list if integer indices are detected (Qiang)
-ENH: Ticket#722 - Add Read Only capabilities to TInPlaceTextBox (Christophe)
+ENH: Ticket#722 - Added Read Only capabilities to TInPlaceTextBox (Christophe)
+ENH: Ticket#741 - Added CDbConnection.currentTransaction property (Qiang)
 ENH: Ticket#743 - Added status code header in HTTP response when in error (Qiang)
 ENH: Ticket#783 - Added date/time type support to soap implementation (Hongliang)

trunk/framework/Data/TDbConnection.php

@@ -86 +86 @@
         private $_active=false;
         private $_pdo=null;
+        private $_transaction;
 
         /**
@@ -251 +252 @@
 
         /**
+         * @return CDbTransaction the currently active transaction. Null if no active transaction.
+         */
+        public function getCurrentTransaction()
+        {
+                if($this->_transaction!==null)
+                {
+                        if($this->_transaction->getActive())
+                                return $this->_transaction;
+                }
+                return null;
+        }
+
+        /**
          * Starts a transaction.
          * @return TDbTransaction the transaction initiated
@@ -260 +274 @@
                 {
                         $this->_pdo->beginTransaction();
-                        return new TDbTransaction($this);
+                        return $this->_transaction=new TDbTransaction($this);
                 }
                 else