Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

1 files changed, 34 insertions, 0 deletions

diff --git a/test/classes/Navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
index 5d9e38d547..b803efe6fb 100644
--- a/test/classes/Navigation/NavigationTreeTest.php
+++ b/test/classes/Navigation/NavigationTreeTest.php
@@ -77,4 +77,38 @@ class NavigationTreeTest extends AbstractTestCase
         $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);
+    }
 }