Merge pull request #1258 from prengerjarno/prefer-primary-over-master

fix: Prefer primary config over master.
doctrine · Nov 14, 2020 · 85460b8 · 85460b8
2 parents 5a94ec5 + 70faa08
commit 85460b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -59,17 +59,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $driverOptions = $params['driverOptions'];
         }
 
-        if (isset($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['driverOptions'] = $driverOptions;
         }
 
+        if (isset($params['master'])) {
+            $params                  = $params['master'];
+            $params['driverOptions'] = $driverOptions;
+        }
+
         // Cannot inject `shard` option in parent::getDoctrineConnection
         // cause it will try to connect to a non-existing database
         if (isset($params['shards'])) {

diff --git a/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php
@@ -68,17 +68,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $driverOptions = $params['driverOptions'];
         }
 
-        if (isset($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['driverOptions'] = $driverOptions;
         }
 
+        if (isset($params['master'])) {
+            $params                  = $params['master'];
+            $params['driverOptions'] = $driverOptions;
+        }
+
         if (isset($params['shards'])) {
             $shards = $params['shards'];
             // Default select global