Fix Charset passed via URL is overridden (#1363)

doctrine · Jun 1, 2021 · aa17a6c · aa17a6c
1 parent 7f472cc
commit aa17a6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/ConnectionFactory.php b/ConnectionFactory.php
@@ -81,14 +81,16 @@ public function createConnection(array $params, ?Configuration $config = null, ?
                 $params['dbname'] .= $params['dbname_suffix'];
             }
 
-            if ($driver instanceof AbstractMySQLDriver) {
-                $params['charset'] = 'utf8mb4';
+            if (! isset($params['charset'])) {
+                if ($driver instanceof AbstractMySQLDriver) {
+                    $params['charset'] = 'utf8mb4';
 
-                if (! isset($params['defaultTableOptions']['collate'])) {
-                    $params['defaultTableOptions']['collate'] = 'utf8mb4_unicode_ci';
+                    if (! isset($params['defaultTableOptions']['collate'])) {
+                        $params['defaultTableOptions']['collate'] = 'utf8mb4_unicode_ci';
+                    }
+                } else {
+                    $params['charset'] = 'utf8';
                 }
-            } else {
-                $params['charset'] = 'utf8';
             }
 
             if ($wrapperClass !== null) {

diff --git a/Tests/ConnectionFactoryTest.php b/Tests/ConnectionFactoryTest.php
@@ -98,6 +98,13 @@ public function testConnectionOverrideOptions(): void
         $this->assertEquals($params, array_intersect_key($connection->getParams(), $params));
     }
 
+    public function testConnectionCharsetFromUrl()
+    {
+        $connection = (new ConnectionFactory([]))->createConnection(['url' => 'mysql://root:password@database:3306/main?charset=utf8mb4_unicode_ci']);
+
+        $this->assertEquals('utf8mb4_unicode_ci', $connection->getParams()['charset']);
+    }
+
     public function testDbnameSuffix(): void
     {
         $connection = (new ConnectionFactory([]))->createConnection([