Ensure that a connection exists in rollback.

Calling rollbackTransaction on a disconnected driver should not fatally error.
cakephp · Mar 24, 2016 · 8d61871 · 8d61871
1 parent 51ce73f
commit 8d61871
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -139,12 +139,13 @@ public function commitTransaction()
     }
 
     /**
-     * Rollsback a transaction
+     * Rollback a transaction
      *
      * @return bool true on success, false otherwise
      */
     public function rollbackTransaction()
     {
+        $this->connect();
         if (!$this->_connection->inTransaction()) {
             return false;
         }

diff --git a/tests/TestCase/Database/Driver/MysqlTest.php b/tests/TestCase/Database/Driver/MysqlTest.php
@@ -141,4 +141,23 @@ public function testIsConnected()
         $connection->connect();
         $this->assertTrue($connection->isConnected(), 'Should be connected.');
     }
+
+    public function testRollbackTransactionAutoConnect()
+    {
+        $connection = ConnectionManager::get('test');
+        $connection->disconnect();
+
+        $driver = $connection->driver();
+        $this->assertFalse($driver->rollbackTransaction());
+        $this->assertTrue($driver->isConnected());
+    }
+
+    public function testCommitTransactionAutoConnect()
+    {
+        $connection = ConnectionManager::get('test');
+        $driver = $connection->driver();
+
+        $this->assertFalse($driver->commitTransaction());
+        $this->assertTrue($driver->isConnected());
+    }
 }