Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [refac] Improve charset encoding validation in dbh constructor.

Browse Source
This commit is contained in:
liugang
2025-11-20 18:16:33 +08:00
parent 4c60080021
commit 3d56851172
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dbh/dbh.class.php
+5 -3
View File
@@ -136,9 +136,11 @@ class dbh
/* Mysql driver include mysql and oceanbase. */
if($driver == 'mysql')
{
$collation = $dbConfig->collation ?? 'utf8mb4_general_ci';
$queries[] = "SET NAMES {$dbConfig->encoding}";
$queries[] = "SET COLLATION_CONNECTION = '{$collation}'";
$encoding = strtolower($dbConfig->encoding ?? 'utf8mb4');
$collation = strtolower($dbConfig->collation ?? 'utf8mb4_general_ci');
if($encoding !== 'utf8mb4') $encoding = 'utf8mb4';
if(strpos($collation, $encoding) !== 0) $collation = 'utf8mb4_general_ci';
$queries[] = "SET NAMES {$encoding} COLLATE '{$collation}'";
if(isset($dbConfig->strictMode) && empty($dbConfig->strictMode)) $queries[] = "SET @@sql_mode= ''";
}
else