Merge pull request #1240 from doctrine/feature-1230

Fix #1230 - Console commands do not respect driverOptions when master/slave configuration is used
doctrine · Oct 28, 2020 · 6b16203 · 6b16203
2 parents f67f94f + 4353686
commit 6b16203
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -261,7 +261,6 @@ protected function getConnectionOptions($connection)
         if (! empty($options['slaves'])) {
             $nonRewrittenKeys = [
                 'driver' => true,
-                'driverOptions' => true,
                 'driverClass' => true,
                 'wrapperClass' => true,
                 'keepSlave' => true,

diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -126,6 +126,7 @@ public function testDbalLoadSingleMasterSlaveConnection()
                 'dbname' => 'mysql_db',
                 'host' => 'localhost',
                 'unix_socket' => '/path/to/mysqld.sock',
+                'driverOptions' => [],
             ],
             $param['master']
         );