Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 9706a78544ba · 2023-07-13T17:53:07.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - issue #17528 Fix double escaping of database group names in the navigation tree
 - issue #18473 Fix the NULL not applied after clearing nullable field
 - issue #18454 Fix date field calendar display when changing NULL state
+- issue #18481 Fix missing pagination when using SELECT DISTINCT
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
@@ -397,6 +397,14 @@ public static function dataProviderCountQueryResults(): array
                 20,
 
             ],
+            [
+                'SELECT DISTINCT country_id FROM city;',
+                ['max_rows' => 25, 'pos' => 0],
+                25,
+                109,
+                false,
+                'SELECT COUNT(*) FROM (SELECT DISTINCT country_id FROM city ) as cnt',
+            ],
         ];
     }
 
