Merge db0fa54a74 into c60de5bea0

lib/private/DB/Connection.php

@@ -58,6 +58,7 @@ use OCP\Profiler\IProfiler;
 use OCP\Server;
 use Psr\Clock\ClockInterface;
 use Psr\Log\LoggerInterface;
+use function count;
 use function in_array;
 
 class Connection extends PrimaryReadReplicaConnection {
@@ -100,7 +101,7 @@ class Connection extends PrimaryReadReplicaConnection {
 	 * @throws \Exception
 	 */
 	public function __construct(
-		array $params,
+		private array $params,
 		Driver $driver,
 		?Configuration $config = null,
 		?EventManager $eventManager = null
@@ -163,6 +164,15 @@ class Connection extends PrimaryReadReplicaConnection {
 		}
 	}
 
+	protected function performConnect(?string $connectionName = null): bool {
+		if (($connectionName ?? 'replica') === 'replica'
+			&& count($this->params['replica']) === 1
+			&& $this->params['primary'] === $this->params['replica'][0]) {
+			return parent::performConnect('primary');
+		}
+		return parent::performConnect($connectionName);
+	}
+
 	public function getStats(): array {
 		return [
 			'built' => $this->queriesBuilt,

lib/private/DB/SetTransactionIsolationLevel.php

@@ -39,11 +39,9 @@ class SetTransactionIsolationLevel implements EventSubscriber {
 	 */
 	public function postConnect(ConnectionEventArgs $args) {
 		$connection = $args->getConnection();
-		if ($connection instanceof PrimaryReadReplicaConnection && $connection->isConnectedToPrimary()) {
-			$connection->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
-			if ($connection->getDatabasePlatform() instanceof MySQLPlatform) {
-				$connection->executeStatement('SET SESSION AUTOCOMMIT=1');
-			}
+		$connection->setTransactionIsolation(TransactionIsolationLevel::READ_COMMITTED);
+		if ($connection->getDatabasePlatform() instanceof MySQLPlatform) {
+			$connection->executeStatement('SET SESSION AUTOCOMMIT=1');
 		}
 	}