From d4d6ea3cbf19f9d5d04382603331f1eed1fc681f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Thu, 9 Aug 2018 19:06:43 +0200 Subject: [PATCH] Fix url resolution for master/slave connections --- lib/Doctrine/DBAL/DriverManager.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php index 22ae8ac3264..3ea36c18033 100644 --- a/lib/Doctrine/DBAL/DriverManager.php +++ b/lib/Doctrine/DBAL/DriverManager.php @@ -153,7 +153,17 @@ public static function getConnection( $eventManager = new EventManager(); } - $params = self::parseDatabaseUrl($params); + if (isset($params['master'])) { + $params['master'] = self::parseDatabaseUrl($params['master']); + + if (isset($params['slaves'])) { + foreach ($params['slaves'] as $slaveName => $slaveParams) { + $params['slaves'][$slaveName] = self::parseDatabaseUrl($slaveParams); + } + } + } else { + $params = self::parseDatabaseUrl($params); + } // check for existing pdo object if (isset($params['pdo']) && ! $params['pdo'] instanceof \PDO) {