Rename "connection_collation" config to "collation"

config/global.ini.php

@@ -50,7 +50,7 @@
 ; If you encounter "Illegal mix of collation" errors, setting this config to the value matching
 ; your existing database tables can help.
 ; This setting will only be used if "charset" is also set.
-connection_collation =
+collation =
 
 ; Database error codes to ignore during updates
 ;

core/Db.php

@@ -186,7 +186,7 @@ public static function createReaderDatabaseObject($dbConfig = null)
         $dbConfig['type'] = $masterDbConfig['type'];
         $dbConfig['tables_prefix'] = $masterDbConfig['tables_prefix'];
         $dbConfig['charset'] = $masterDbConfig['charset'];
-        $dbConfig['connection_collation'] = $masterDbConfig['connection_collation'] ?? null;
+        $dbConfig['collation'] = $masterDbConfig['collation'] ?? null;
 
         $db = @Adapter::factory($dbConfig['adapter'], $dbConfig);
 

core/Tracker/Db/Mysqli.php

@@ -26,7 +26,7 @@ class Mysqli extends Db
     protected $username;
     protected $password;
     protected $charset;
-    protected $connectionCollation;
+    protected $collation;
     protected $activeTransaction = false;
 
     protected $enable_ssl;
@@ -63,7 +63,7 @@ public function __construct($dbInfo, $driverName = 'mysql')
         $this->username = $dbInfo['username'];
         $this->password = $dbInfo['password'];
         $this->charset = $dbInfo['charset'] ?? null;
-        $this->connectionCollation = $dbInfo['connection_collation'] ?? null;
+        $this->collation = $dbInfo['collation'] ?? null;
 
         if (!empty($dbInfo['enable_ssl'])) {
             $this->enable_ssl = $dbInfo['enable_ssl'];
@@ -135,9 +135,9 @@ public function connect()
             throw new DbException("Connect failed: " . mysqli_connect_error());
         }
 
-        if ($this->charset && $this->connectionCollation) {
+        if ($this->charset && $this->collation) {
             // mysqli_set_charset does not support setting a collation
-            $query = "SET NAMES '" . $this->charset . "' COLLATE '" . $this->connectionCollation . "'";
+            $query = "SET NAMES '" . $this->charset . "' COLLATE '" . $this->collation . "'";
 
             if (!mysqli_query($this->connection, $query)) {
                 throw new DbException("Set charset/connection collation failed: " . mysqli_error($this->connection));

core/Tracker/Db/Pdo/Mysql.php

@@ -50,7 +50,7 @@ class Mysql extends Db
     /**
      * @var string|null
      */
-    private $connectionCollation;
+    private $collation;
 
     protected $mysqlOptions = [];
 
@@ -79,8 +79,8 @@ public function __construct($dbInfo, $driverName = 'mysql')
             $this->charset = $dbInfo['charset'];
             $this->dsn .= ';charset=' . $this->charset;
 
-            if (!empty($dbInfo['connection_collation'])) {
-                $this->connectionCollation = $dbInfo['connection_collation'];
+            if (!empty($dbInfo['collation'])) {
+                $this->collation = $dbInfo['collation'];
             }
         }
 
@@ -433,8 +433,8 @@ private function establishConnection(): void
         if (!empty($this->charset)) {
             $sql = "SET NAMES '" . $this->charset . "'";
 
-            if (!empty($this->connectionCollation)) {
-                $sql .= " COLLATE '" . $this->connectionCollation . "'";
+            if (!empty($this->collation)) {
+                $sql .= " COLLATE '" . $this->collation . "'";
             }
 
             $this->connection->exec($sql);

libs/Zend/Db/Adapter/Mysqli.php

@@ -375,9 +375,9 @@ protected function _connect()
             throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error());
         }
 
-        if (!empty($this->_config['charset']) && !empty($this->_config['connection_collation'])) {
+        if (!empty($this->_config['charset']) && !empty($this->_config['collation'])) {
             // mysqli_set_charset does not support setting a collation
-            $query = "SET NAMES '" . $this->_config['charset'] . "' COLLATE '" . $this->_config['connection_collation'] . "'";
+            $query = "SET NAMES '" . $this->_config['charset'] . "' COLLATE '" . $this->_config['collation'] . "'";
 
             mysqli_query($this->_connection, $query);
         } elseif (!empty($this->_config['charset'])) {

libs/Zend/Db/Adapter/Pdo/Mysql.php

@@ -104,8 +104,8 @@ protected function _connect()
         if (!empty($this->_config['charset'])) {
             $initCommand = "SET NAMES '" . $this->_config['charset'] . "'";
 
-            if (!empty($this->_config['connection_collation'])) {
-                $initCommand .= " COLLATE '" . $this->_config['connection_collation'] . "'";
+            if (!empty($this->_config['collation'])) {
+                $initCommand .= " COLLATE '" . $this->_config['collation'] . "'";
             }
 
             $this->_config['driver_options'][1002] = $initCommand; // 1002 = PDO::MYSQL_ATTR_INIT_COMMAND

tests/PHPUnit/Integration/DbTest.php

@@ -266,7 +266,7 @@ public function testConnectionCollationDefault(string $adapter, string $expected
 
         $config = Config::getInstance();
         $config->database['adapter'] = $adapter;
-        $config->database['connection_collation'] = null;
+        $config->database['collation'] = null;
 
         $db = Db::get();
         self::assertInstanceOf($expectedClass, $db);
@@ -285,13 +285,13 @@ public function testConnectionCollationSetInConfig(string $adapter, string $expe
 
         $config = Config::getInstance();
         $config->database['adapter'] = $adapter;
-        $config->database['connection_collation'] = $config->database['charset'] . '_swedish_ci';
+        $config->database['collation'] = $config->database['charset'] . '_swedish_ci';
 
         $db = Db::get();
         self::assertInstanceOf($expectedClass, $db);
 
         $currentCollation = $db->fetchOne('SELECT @@collation_connection');
-        self::assertSame($config->database['connection_collation'], $currentCollation);
+        self::assertSame($config->database['collation'], $currentCollation);
     }
 
     public function getDbAdapter()

tests/PHPUnit/Integration/Tracker/Db/MysqliTest.php

@@ -46,7 +46,7 @@ public function testConnectionThrowsOnInvalidConnectionCollation(): void
         self::expectExceptionMessageMatches('/Set charset\/connection collation failed/');
 
         $config = Config::getInstance();
-        $config->database['connection_collation'] = 'something really invalid';
+        $config->database['collation'] = 'something really invalid';
 
         Tracker\Db::connectPiwikTrackerDb();
     }

tests/PHPUnit/Integration/Tracker/DbTest.php

@@ -195,7 +195,7 @@ public function testFetchAllNoMatch()
     public function testConnectionCollationDefault(): void
     {
         $config = Config::getInstance();
-        $config->database['connection_collation'] = null;
+        $config->database['collation'] = null;
         $db = Tracker\Db::connectPiwikTrackerDb();
 
         // exact value depends on database used
@@ -206,11 +206,11 @@ public function testConnectionCollationDefault(): void
     public function testConnectionCollationSetInConfig(): void
     {
         $config = Config::getInstance();
-        $config->database['connection_collation'] = $config->database['charset'] . '_swedish_ci';
+        $config->database['collation'] = $config->database['charset'] . '_swedish_ci';
         $db = Tracker\Db::connectPiwikTrackerDb();
 
         $currentCollation = $db->fetchOne('SELECT @@collation_connection');
-        self::assertSame($config->database['connection_collation'], $currentCollation);
+        self::assertSame($config->database['collation'], $currentCollation);
     }
 
     private function insertRowId($value = '1')