MasterSlaveConnection::ping() throws PDOException

lib/Doctrine/DBAL/Connection.php

@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Cache\ResultCacheStatement;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
+use Doctrine\DBAL\Driver\PDOException;
 use Doctrine\DBAL\Driver\PingableConnection;
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
@@ -1671,7 +1672,7 @@ public function ping()
             $this->query($this->getDatabasePlatform()->getDummySelectSQL());
 
             return true;
-        } catch (DBALException $e) {
+        } catch (PDOException | DBALException $e) {
             return false;
         }
     }

lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php

@@ -5,11 +5,13 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\Connection as DriverConnection;
 use Doctrine\DBAL\Event\ConnectionEventArgs;
 use Doctrine\DBAL\Events;
 use InvalidArgumentException;
+use Throwable;
 use function array_rand;
 use function count;
 use function func_get_args;
@@ -352,7 +354,11 @@ public function query()
             $logger->startQuery($args[0]);
         }
 
-        $statement = $this->_conn->query(...$args);
+        try {
+            $statement = $this->_conn->query(...$args);
+        } catch (Throwable $e) {
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $e, $args[0]);
+        }
 
         if ($logger) {
             $logger->stopQuery();

tests/Doctrine/Tests/DBAL/Functional/MasterSlaveConnectionTest.php

@@ -189,4 +189,14 @@ public function testMasterSlaveConnectionCloseAndReconnect()
         $conn->connect('master');
         self::assertTrue($conn->isConnectedToMaster());
     }
+
+    public function testPingDoesTriggersConnect()
+    {
+        $conn = $this->createMasterSlaveConnection();
+
+        $conn->connect('master');
+
+        self::assertTrue($conn->ping());
+        self::assertTrue($conn->isConnectedToMaster());
+    }
 }