Browse Source

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

fix: Avoid using replicas during setup
tags/v29.0.0beta1
Julius Härtl 6 months ago
parent
commit
7812a02998
No account linked to committer's email address
1 changed files with 5 additions and 3 deletions
  1. 5
    3
      lib/private/Setup/AbstractDatabase.php

+ 5
- 3
lib/private/Setup/AbstractDatabase.php View File

@@ -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;
}

/**

Loading…
Cancel
Save