gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #19621 - Fix #19109 - Do not enforce character encoding when checking roles

Browse Source 
Pull-request: #19621
Fixes: #19109
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2025-09-14 18:50:16 +02:00
commit ae27e63d8e
No known key found for this signature in database
GPG Key ID: 70684F4717D49A31
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/classes/Query/Generator.php
View File

@ -229,7 +229,7 @@ class Generator
. "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE`"
. ' UNION '
. 'SELECT 1 FROM mysql.user '
. "WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci AND "
. "WHERE `create_user_priv` = 'Y' AND "
. "'" . $user . "' LIKE `User` AND '' LIKE `Host`"
. ' LIMIT 1';
}
@ -250,7 +250,7 @@ class Generator
. "'''" . $user . "''@''" . $host . "''' LIKE `GRANTEE` "
. ' UNION '
. 'SELECT 1 FROM mysql.user '
. "WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci AND "
. "WHERE `create_user_priv` = 'Y' AND "
. "'" . $user . "' LIKE `User` AND '' LIKE `Host`"
. ' LIMIT 1';
}

4
test/classes/Stubs/DbiDummy.php
View File

@ -583,7 +583,7 @@ class DbiDummy implements DbiExtension
'query' => 'SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`'
. " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'"
. " AND '''pma_test''@''localhost''' LIKE `GRANTEE`"
. " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci"
. " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y'"
. " AND 'pma_test' LIKE `User` AND '' LIKE `Host` LIMIT 1",
'result' => [['1']],
],
@ -598,7 +598,7 @@ class DbiDummy implements DbiExtension
. ' FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`) t'
. " WHERE `IS_GRANTABLE` = 'YES'"
. " AND '''pma_test''@''localhost''' LIKE `GRANTEE`"
. " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y' COLLATE utf8mb4_general_ci"
. " UNION SELECT 1 FROM mysql.user WHERE `create_user_priv` = 'Y'"
. " AND 'pma_test' LIKE `User` AND '' LIKE `Host` LIMIT 1",
'result' => [['1']],
],