Merge pull request #42504 from nextcloud/bugfix/setup-primary

fix: Avoid using replicas during setup
nextcloud · Dec 28, 2023 · 7812a02 · 7812a02
2 parents 2362a96 + 81b089c
commit 7812a02
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
@@ -140,10 +140,12 @@ protected function connect(array $configOverwrite = []): Connection {
 			}
 			$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;
 	}
 
 	/**