Fix db name suffix parsing for replica (#1470)

Co-authored-by: Gabriel Ostrolucký <gadelat@gmail.com>
Co-authored-by: Gabriel Ostrolucký <gabriel.ostrolucky@gmail.com>

Author: kschusternetformic

ConnectionFactory.php

@@ -69,13 +69,9 @@ public function createConnection(array $params, ?Configuration $config = null, ?
             }
 
             $connection = DriverManager::getConnection($params, $config, $eventManager);
-            $params     = array_merge($connection->getParams(), $overriddenOptions);
+            $params     = $this->addDatabaseSuffix(array_merge($connection->getParams(), $overriddenOptions));
             $driver     = $connection->getDriver();
 
-            if (isset($params['dbname']) && isset($params['dbname_suffix'])) {
-                $params['dbname'] .= $params['dbname_suffix'];
-            }
-
             if (! isset($params['charset'])) {
                 if ($driver instanceof AbstractMySQLDriver) {
                     $params['charset'] = 'utf8mb4';
@@ -160,4 +156,30 @@ private function initializeTypes(): void
 
         $this->initialized = true;
     }
+
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
+    private function addDatabaseSuffix(array $params): array
+    {
+        if (isset($params['dbname']) && isset($params['dbname_suffix'])) {
+            $params['dbname'] .= $params['dbname_suffix'];
+        }
+
+        foreach ($params['replica'] ?? [] as $key => $replicaParams) {
+            if (! isset($replicaParams['dbname'], $replicaParams['dbname_suffix'])) {
+                continue;
+            }
+
+            $params['replica'][$key]['dbname'] .= $replicaParams['dbname_suffix'];
+        }
+
+        if (isset($params['primary']['dbname'], $params['primary']['dbname_suffix'])) {
+            $params['primary']['dbname'] .= $params['primary']['dbname_suffix'];
+        }
+
+        return $params;
+    }
 }

Resources/doc/configuration.rst

@@ -148,6 +148,7 @@ Configuration Reference
                                 user:                 root
                                 password:             ~
                                 charset:              ~
+                                dbname_suffix:        ~
                                 path:                 ~
                                 memory:               ~
 
@@ -516,6 +517,7 @@ Configuration Reference
                             user="root"
                             password="null"
                             charset=""
+                            dbname_suffix=""
                             path=""
                             memory=""
                             unix-socket=""

Tests/ConnectionFactoryTest.php

@@ -167,6 +167,31 @@ public function testDbnameSuffix(): void
 
         $this->assertSame('main_test', $connection->getParams()['dbname']);
     }
+
+    public function testDbnameSuffixForReplicas(): void
+    {
+        $connection = (new ConnectionFactory([]))->createConnection([
+            'driver' => 'pdo_mysql',
+            'primary' => [
+                'url' => 'mysql://root:password@database:3306/primary?serverVersion=mariadb-10.5.8',
+                'dbname_suffix' => '_test',
+            ],
+            'replica' => [
+                'replica1' => [
+                    'url' => 'mysql://root:password@database:3306/replica?serverVersion=mariadb-10.5.8',
+                    'dbname_suffix' => '_test',
+                ],
+            ],
+        ]);
+
+        $parsedParams = $connection->getParams();
+        $this->assertArrayHasKey('primary', $parsedParams);
+        $this->assertArrayHasKey('replica', $parsedParams);
+        $this->assertArrayHasKey('replica1', $parsedParams['replica']);
+
+        $this->assertSame('primary_test', $parsedParams['primary']['dbname']);
+        $this->assertSame('replica_test', $parsedParams['replica']['replica1']['dbname']);
+    }
 }
 
 /**