Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit cd90930d124d · 2022-07-23T18:55:51.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog
 - issue #17593 Table filtering now works when action buttons are on the right side of the row
 - issue #17388 Find and Replace using regex now makes a valid query if no matching result set found
 - issue #17551 Enum/Set editor will not fail to open when creating a new column
+- issue #17659 Fix error when a database group is named tables, views, functions, procedures or events
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
@@ -41,7 +41,6 @@
 use function mb_strlen;
 use function mb_strpos;
 use function mb_substr;
-use function method_exists;
 use function sort;
 use function sprintf;
 use function strcasecmp;
@@ -1306,11 +1305,10 @@ private function fastFilterHtml(Node $node): string
 
             $nodeIsSpecial = in_array($node->realName, self::SPECIAL_NODE_NAMES, true);
 
-            /** @var Node $realParent */
             $realParent = $node->realParent();
             if (
-                ($nodeIsContainer && $nodeIsSpecial)
-                && method_exists($realParent, 'getPresence')
+                $nodeIsContainer && $nodeIsSpecial
+                && $realParent instanceof Node
                 && $realParent->getPresence($node->realName) >= $filterItemMin
             ) {
                 $paths = $node->getPaths();
diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
@@ -77,4 +77,38 @@ public function testRenderDbSelect(): void
         $result = $this->object->renderDbSelect();
         $this->assertStringContainsString('pma_navigation_select_database', $result);
     }
+
+    public function testDatabaseGrouping(): void
+    {
+        $GLOBALS['db'] = '';
+        $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '__';
+
+        // phpcs:disable Generic.Files.LineLength.TooLong
+        $dummyDbi = $this->createDbiDummy();
+        $dummyDbi->addResult(
+            'SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, (SELECT DB_first_level FROM ( SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, \'__\', 1) DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t ORDER BY DB_first_level ASC LIMIT 0, 100) t2 WHERE TRUE AND 1 = LOCATE(CONCAT(DB_first_level, \'__\'), CONCAT(SCHEMA_NAME, \'__\')) ORDER BY SCHEMA_NAME ASC',
+            [['functions__a'], ['functions__b']],
+            ['SCHEMA_NAME']
+        );
+        $dummyDbi->addResult(
+            'SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, \'__\', 1) DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t',
+            [['2']]
+        );
+        $dummyDbi->addResult(
+            'SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, \'__\', 1) DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t',
+            [['2']]
+        );
+        // phpcs:enable
+
+        $dbi = $this->createDatabaseInterface($dummyDbi);
+        $GLOBALS['dbi'] = $dbi;
+
+        $object = new NavigationTree(new Template(), $dbi);
+        $result = $object->renderState();
+        $this->assertStringContainsString('<li class="first navGroup">', $result);
+        $this->assertStringContainsString('functions' . "\n", $result);
+        $this->assertStringContainsString('<div class="list_container" style="display: none;">', $result);
+        $this->assertStringContainsString('functions__a', $result);
+        $this->assertStringContainsString('functions__b', $result);
+    }
 }
