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

MauricioFauth · web-flow · commit 6ed03b3f0083 · 2022-08-22T21:15:57.000-03:00
Fix incomplete Privileges test
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
@@ -1698,10 +1698,9 @@ public function getUserSpecificRights($username, $hostname, $type, $dbname = '')
                 continue;
             }
 
-            $dbRightsSqls[] = '
-                SELECT DISTINCT `' . $dbOrTableName . '`
-                FROM `mysql`.' . Util::backquote($tableSearchIn)
-               . $userHostCondition;
+            $dbRightsSqls[] = 'SELECT DISTINCT `' . $dbOrTableName
+                . '` FROM `mysql`.' . Util::backquote($tableSearchIn)
+                . $userHostCondition;
         }
 
         $userDefaults = [
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
@@ -1636,7 +1636,7 @@ public function testGetHtmlForAllTableSpecificRights(): void
         );
         // 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 @@ public function testGetHtmlForAllTableSpecificRights(): void
             ['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']
         );

Original file line number	Diff line number	Diff line change
`@@ -1698,10 +1698,9 @@ public function getUserSpecificRights($username, $hostname, $type, $dbname = '')`
`1698`	`1698`	`continue;`
`1699`	`1699`	`}`
`1700`	`1700`
`1701`		`- $dbRightsSqls[] = '`
`1702`		- SELECT DISTINCT `' . $dbOrTableName . '`
`1703`		- FROM `mysql`.' . Util::backquote($tableSearchIn)
`1704`		`- . $userHostCondition;`
	`1701`	+ $dbRightsSqls[] = 'SELECT DISTINCT `' . $dbOrTableName
	`1702`	+ . '` FROM `mysql`.' . Util::backquote($tableSearchIn)
	`1703`	`+ . $userHostCondition;`
`1705`	`1704`	`}`
`1706`	`1705`
`1707`	`1706`	`$userDefaults = [`