fix: Avoid using replicas during setup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 88a31eaccdcfa81d42dd06f564348964a77533ea..82c00cb271aae201171a8a5d767fe2ddac66505d 100644 (file)
--- a/lib/private/Setup/AbstractDatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
@@ -140,10 +140,12 @@ abstract class AbstractDatabase {
                        }
                        $connectionParams['host'] = $host;
                }
-
-               $connectionParams = array_merge($connectionParams, ['primary' => $connectionParams, 'replica' => [$connectionParams]], $configOverwrite);
+               $connectionParams = array_merge($connectionParams, $configOverwrite);
+               $connectionParams = array_merge($connectionParams, ['primary' => $connectionParams, 'replica' => [$connectionParams]]);
                $cf = new ConnectionFactory($this->config);
-               return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+               $connection = $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+               $connection->ensureConnectedToPrimary();
+               return $connection;
        }
 
        /**