Merge pull request #44470 from nextcloud/fix/compatibility-replica-splitting

Altahrim · web-flow · commit b304dc78f889 · 2024-03-26T20:27:14.000+01:00
diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php
@@ -242,7 +242,7 @@ public function createConnectionParams(string $configPrefix = '') {
 			$connectionParams['persistent'] = true;
 		}
 
-		$replica = $this->config->getValue('dbreplica', []) ?: [$connectionParams];
+		$replica = $this->config->getValue($configPrefix . 'dbreplica', $this->config->getValue('dbreplica', [])) ?: [$connectionParams];
 		return array_merge($connectionParams, [
 			'primary' => $connectionParams,
 			'replica' => $replica,

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public function createConnectionParams(string $configPrefix = '') {`
`242`	`242`	`$connectionParams['persistent'] = true;`
`243`	`243`	`}`
`244`	`244`
`245`		`- $replica = $this->config->getValue('dbreplica', []) ?: [$connectionParams];`
	`245`	`+ $replica = $this->config->getValue($configPrefix . 'dbreplica', $this->config->getValue('dbreplica', [])) ?: [$connectionParams];`
`246`	`246`	`return array_merge($connectionParams, [`
`247`	`247`	`'primary' => $connectionParams,`
`248`	`248`	`'replica' => $replica,`