Merge pull request #7690 from xintesa/3.1-port-7428

Forward port #7428
cakephp · Nov 28, 2015 · 380a466 · 380a466
2 parents b5206cc + 2180fd0
commit 380a466
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -76,6 +76,26 @@ public function disconnect()
         $this->_connection = null;
     }
 
+    /**
+     * Check whether or not the driver is connected.
+     *
+     * @return bool
+     */
+    public function isConnected()
+    {
+        if ($this->_connection === null) {
+            $connected = false;
+        } else {
+            try {
+                $connected = $this->_connection->query('SELECT 1');
+            } catch (\PDOException $e) {
+                $connected = false;
+            }
+        }
+        $this->connected = !empty($connected);
+        return $this->connected;
+    }
+
     /**
      * Prepares a sql statement to be executed
      *

diff --git a/tests/TestCase/Database/Driver/MysqlTest.php b/tests/TestCase/Database/Driver/MysqlTest.php
@@ -128,4 +128,18 @@ public function testConnectionConfigCustom()
             ->will($this->returnValue($connection));
         $driver->connect($config);
     }
+
+    /**
+     * Test isConnected
+     *
+     * @return void
+     */
+    public function testIsConnected() {
+        $connection = ConnectionManager::get('test');
+        $connection->disconnect();
+        $this->assertFalse($connection->isConnected(), 'Not connected now.');
+
+        $connection->connect();
+        $this->assertTrue($connection->isConnected(), 'Should be connected.');
+    }
 }