yiisoft · samdark · May 4, 2017 · Apr 20, 2017 · Apr 20, 2017 · Apr 20, 2017
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -44,6 +44,7 @@ Yii Framework 2 Change Log
 - Bug #13790: Fixed error in `\yii\widgets\MaskedInput` JavaScript by raising version required (samdark)
 - Bug #13807: Fixed `yii\db\QueryBuilder` to inherit subquery params when building a `INSERT INTO ... SELECT` query (sergeymakinen)
 - Bug #13848: `yii\di\Instance::ensure()` wasn't throwing an exception when `$type` is specified and `$reference` object isn't instance of `$type` (c-jonua)
+- Bug #13890: DbTarget log transaction bug (shirase)
 - Bug #13901: Fixed passing unused parameter to `formatMessage()` call in `\yii\validators\IpValidator` (Kolyunya)
 - Bug #13961: Fixed `unserialize()` error during RBAC rule retrieving from PostgreSQL DBMS (vsguts)
 - Bug #14012: `yii\db\pgsql\Schema::findViewNames()` was skipping materialized views (insolita)

diff --git a/framework/log/DbTarget.php b/framework/log/DbTarget.php
@@ -60,6 +60,12 @@ public function init()
      */
     public function export()
     {
+        if ($this->db->getTransaction()) {
+            $this->db = clone $this->db;
+            $this->db->pdo = null;
 if ($this->_master) { 
     if ($this->pdo === $this->_master->pdo) { 
         $this->pdo = null; 
     } 
     $this->_master->close(); 
     $this->_master = null; 
 } 
 if ($this->pdo !== null) { 
     Yii::trace('Closing DB connection: ' . $this->dsn, __METHOD__); 
     $this->pdo = null; 
     $this->_schema = null; 
     $this->_transaction = null; 
 } 
 if ($this->_slave) { 
     $this->_slave->close(); 
     $this->_slave = null; 
 } 
 if ($this->_master) { 
     if ($this->pdo === $this->_master->pdo) { 
         $this->pdo = null; 
     } 
  
     $this->_master->close(); 
     $this->_master = null; 
 } 
  
 if ($this->pdo !== null) { 
     Yii::trace('Closing DB connection: ' . $this->dsn, __METHOD__); 
     $this->pdo = null; 
     $this->_schema = null; 
     $this->_transaction = null; 
 } 
  
 if ($this->_slave) { 
     $this->_slave->close(); 
     $this->_slave = null; 
 } 
+            $this->db->open();
+        }
+
         $tableName = $this->db->quoteTableName($this->logTable);
         $sql = "INSERT INTO $tableName ([[level]], [[category]], [[log_time]], [[prefix]], [[message]])
                 VALUES (:level, :category, :log_time, :prefix, :message)";

diff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php
@@ -140,4 +140,29 @@ public function testTimestamp()
         $loggedTime = $query->createCommand(self::getConnection())->queryScalar();
         static::assertEquals($time, $loggedTime);
     }
+
+    public function testTransactionRollBack()
+    {
+        $db = self::getConnection();
+        $logger = Yii::getLogger();
+
+        $tx = $db->beginTransaction();
+
+        $messsageData = [
+            'test',
+            Logger::LEVEL_WARNING,
+            'test',
+            time(),
+            []
+        ];
+
+        $logger->messages[] = $messsageData;
+        $logger->flush(true);
+
+        $tx->rollBack();
+
+        $query = (new Query())->select('COUNT(*)')->from(self::$logTable)->where(['category' => 'test', 'message' => 'test']);
+        $count = $query->createCommand($db)->queryScalar();
+        static::assertEquals(1, $count);
+    }
 }