From f4bdb4ff3aac6403b43353b9d535699e3dc018c5 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Fri, 14 Mar 2025 10:19:19 +0100 Subject: [PATCH] Add collation to getAlterDbCharacterSet --- src/Mysql/MysqlDriver.php | 5 +++-- src/Mysqli/MysqliDriver.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Mysql/MysqlDriver.php b/src/Mysql/MysqlDriver.php index c41517d0..b41127ab 100644 --- a/src/Mysql/MysqlDriver.php +++ b/src/Mysql/MysqlDriver.php @@ -296,9 +296,10 @@ public function select($database) */ public function getAlterDbCharacterSet($dbName) { - $charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8'; + $charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8'; + $collation = $charset . '_unicode_ci'; - return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '`'; + return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '` COLLATE `' . $collation . '`'; } /** diff --git a/src/Mysqli/MysqliDriver.php b/src/Mysqli/MysqliDriver.php index 0e0f791c..bcbb99b7 100644 --- a/src/Mysqli/MysqliDriver.php +++ b/src/Mysqli/MysqliDriver.php @@ -392,9 +392,10 @@ public function connected() */ public function getAlterDbCharacterSet($dbName) { - $charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8'; + $charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8'; + $collation = $charset . '_unicode_ci'; - return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '`'; + return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '` COLLATE `' . $collation . '`'; } /**