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

Merge pull request #17691 from kamil-tekiela/Fix-incomplete-test

Browse Source 
Fix incomplete Privileges test
This commit is contained in:
Maurício Meneghini Fauth 2022-08-22 21:15:57 -03:00 committed by GitHub
commit 6ed03b3f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/classes/Server/Privileges.php
View File

@ -1698,10 +1698,9 @@ class Privileges
continue;
}
$dbRightsSqls[] = '
SELECT DISTINCT `' . $dbOrTableName . '`
FROM `mysql`.' . Util::backquote($tableSearchIn)
. $userHostCondition;
$dbRightsSqls[] = 'SELECT DISTINCT `' . $dbOrTableName
. '` FROM `mysql`.' . Util::backquote($tableSearchIn)
. $userHostCondition;
}
$userDefaults = [

4
test/classes/Server/PrivilegesTest.php
View File

@ -1636,7 +1636,7 @@ class PrivilegesTest extends AbstractTestCase
);
// phpcs:disable Generic.Files.LineLength.TooLong
$dummyDbi->addResult(
'( SELECT DISTINCT `Table_name` FROM `mysql`.`columns_priv` WHERE `User` = \'pma\' AND `Host` = \'host\' AND `Db` LIKE \'pmadb\') ORDER BY `Table_name` ASC',
'(SELECT DISTINCT `Table_name` FROM `mysql`.`columns_priv` WHERE `User` = \'pma\' AND `Host` = \'host\' AND `Db` LIKE \'pmadb\') ORDER BY `Table_name` ASC',
[],
['Table_name']
);
@ -1646,7 +1646,7 @@ class PrivilegesTest extends AbstractTestCase
['Table_name', 'Table_priv', 'Column_priv']
);
$dummyDbi->addResult(
'( SELECT DISTINCT `Db` FROM `mysql`.`tables_priv` WHERE `User` = \'pma2\' AND `Host` = \'host2\') UNION ( SELECT DISTINCT `Db` FROM `mysql`.`columns_priv` WHERE `User` = \'pma2\' AND `Host` = \'host2\') ORDER BY `Db` ASC',
'(SELECT DISTINCT `Db` FROM `mysql`.`tables_priv` WHERE `User` = \'pma2\' AND `Host` = \'host2\') UNION (SELECT DISTINCT `Db` FROM `mysql`.`columns_priv` WHERE `User` = \'pma2\' AND `Host` = \'host2\') ORDER BY `Db` ASC',
[],
['Db']
);