Merge release 1.12.12 into 2.0.x (#1256)

Merge release 1.12.12 into 2.0.x
doctrine · Nov 10, 2020 · 9e07bb1 · 9e07bb1
2 parents 898718e + 5a94ec5
commit 9e07bb1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -53,14 +53,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $ifNotExists = $input->getOption('if-not-exists');
 
-        $params = $connection->getParams();
+        $driverOptions = [];
+        $params        = $connection->getParams();
+
+        if (isset($params['driverOptions'])) {
+            $driverOptions = $params['driverOptions'];
+        }
+
         if (isset($params['master'])) {
-            $params = $params['master'];
+            $params                  = $params['master'];
+            $params['driverOptions'] = $driverOptions;
         }
 
         // Since doctrine/dbal 2.11 master has been replaced by primary
         if (isset($params['primary'])) {
-            $params = $params['primary'];
+            $params                  = $params['primary'];
+            $params['driverOptions'] = $driverOptions;
         }
 
         // Cannot inject `shard` option in parent::getDoctrineConnection

diff --git a/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php
@@ -62,14 +62,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $ifExists = $input->getOption('if-exists');
 
-        $params = $connection->getParams();
+        $driverOptions = [];
+        $params        = $connection->getParams();
+
+        if (isset($params['driverOptions'])) {
+            $driverOptions = $params['driverOptions'];
+        }
+
         if (isset($params['master'])) {
-            $params = $params['master'];
+            $params                  = $params['master'];
+            $params['driverOptions'] = $driverOptions;
         }
 
         // Since doctrine/dbal 2.11 master has been replaced by primary
         if (isset($params['primary'])) {
-            $params = $params['primary'];
+            $params                  = $params['primary'];
+            $params['driverOptions'] = $driverOptions;
         }
 
         if (isset($params['shards'])) {

diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -265,6 +265,7 @@ protected function getConnectionOptions($connection)
         if (! empty($options['slaves']) || ! empty($options['replica'])) {
             $nonRewrittenKeys = [
                 'driver' => true,
+                'driverOptions' => true,
                 'driverClass' => true,
                 'wrapperClass' => true,
                 'keepSlave' => true,

diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -135,7 +135,6 @@ class_exists(PrimaryReadReplicaConnection::class) ?
                 'dbname' => 'mysql_db',
                 'host' => 'localhost',
                 'unix_socket' => '/path/to/mysqld.sock',
-                'driverOptions' => [],
             ],
             $param['primary'] ?? $param['master'] // TODO: Remove 'master' support here when we require dbal >= 2.11
         );