use default collation when creating tables

matomo-org · May 2, 2024 · e5d147f · e5d147f
1 parent 73519ba
commit e5d147f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 48 deletions.
diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php
@@ -542,11 +542,12 @@ public function createTable($nameWithoutPrefix, $createDefinition)
         $charset      = $dbSettings->getUsedCharset();
 
         $statement = sprintf(
-            "CREATE TABLE IF NOT EXISTS `%s` ( %s ) ENGINE=%s DEFAULT CHARSET=%s %s;",
+            "CREATE TABLE IF NOT EXISTS `%s` ( %s ) ENGINE=%s DEFAULT CHARSET=%s DEFAULT COLLATE %s_general_ci %s;",
             Common::prefixTable($nameWithoutPrefix),
             $createDefinition,
             $this->getTableEngine(),
             $charset,
+            $charset,
             $dbSettings->getRowFormat()
         );
 

diff --git a/tests/resources/OmniFixture-dump.sql b/tests/resources/OmniFixture-dump.sql