Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit f22126228cdb · 2025-06-08T01:27:16.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/src/Controllers/Table/GisVisualizationController.php b/src/Controllers/Table/GisVisualizationController.php
@@ -20,6 +20,9 @@
 use PhpMyAdmin\Identifiers\DatabaseName;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\ResponseRenderer;
+use PhpMyAdmin\SqlParser\Components\Limit;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Statements\SelectStatement;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\UrlParams;
@@ -80,18 +83,7 @@ public function __invoke(ServerRequest $request): Response
             return $this->response->response();
         }
 
-        $meta = $this->getColumnMeta($sqlQuery);
-
-        // Find the candidate fields for label column and spatial column
-        $labelCandidates = [];
-        $spatialCandidates = [];
-        foreach ($meta as $columnMeta) {
-            if ($columnMeta->isMappedTypeGeometry) {
-                $spatialCandidates[] = $columnMeta->name;
-            } else {
-                $labelCandidates[] = $columnMeta->name;
-            }
-        }
+        [$labelCandidates, $spatialCandidates] = $this->getCandidateColumns($sqlQuery);
 
         if ($spatialCandidates === []) {
             $this->response->setRequestStatus(false);
@@ -254,4 +246,28 @@ private function getColumnMeta(string $sqlQuery): array
 
         return $result === false ? [] : $this->dbi->getFieldsMeta($result);
     }
+
+    /** @return array{list<string>, list<string>} */
+    private function getCandidateColumns(string $sqlQuery): array
+    {
+        $parser = new Parser($sqlQuery);
+        /** @var SelectStatement $statement */
+        $statement = $parser->statements[0];
+        $statement->limit = new Limit(0, 0);
+        $limitedSqlQuery = $statement->build();
+
+        $meta = $this->getColumnMeta($limitedSqlQuery);
+
+        $labelCandidates = [];
+        $spatialCandidates = [];
+        foreach ($meta as $columnMeta) {
+            if ($columnMeta->isMappedTypeGeometry) {
+                $spatialCandidates[] = $columnMeta->name;
+            } else {
+                $labelCandidates[] = $columnMeta->name;
+            }
+        }
+
+        return [$labelCandidates, $spatialCandidates];
+    }
 }
diff --git a/tests/unit/Controllers/Table/GisVisualizationControllerTest.php b/tests/unit/Controllers/Table/GisVisualizationControllerTest.php
@@ -45,7 +45,7 @@ public function testGisVisualizationController(): void
         $dummyDbi = $this->createDbiDummy();
         $dummyDbi->addSelectDb('test_db');
         $dummyDbi->addResult(
-            'SELECT * FROM `gis_all`',
+            'SELECT * FROM `gis_all` LIMIT 0, 0',
             [['POINT', 'POINT(100 250)']],
             ['name', 'shape'],
             [
@@ -127,5 +127,7 @@ public function testGisVisualizationController(): void
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
         self::assertSame($expected, $responseRenderer->getHTMLResult());
+        $dummyDbi->assertAllSelectsConsumed();
+        $dummyDbi->assertAllQueriesConsumed();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testGisVisualizationController(): void`
`45`	`45`	`$dummyDbi = $this->createDbiDummy();`
`46`	`46`	`$dummyDbi->addSelectDb('test_db');`
`47`	`47`	`$dummyDbi->addResult(`
`48`		- 'SELECT * FROM `gis_all`',
	`48`	+ 'SELECT * FROM `gis_all` LIMIT 0, 0',
`49`	`49`	`[['POINT', 'POINT(100 250)']],`
`50`	`50`	`['name', 'shape'],`
`51`	`51`	`[`
`@@ -127,5 +127,7 @@ public function testGisVisualizationController(): void`
`127`	`127`
`128`	`128`	`self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());`
`129`	`129`	`self::assertSame($expected, $responseRenderer->getHTMLResult());`
	`130`	`+ $dummyDbi->assertAllSelectsConsumed();`
	`131`	`+ $dummyDbi->assertAllQueriesConsumed();`
`130`	`132`	`}`
`131`	`133`	`}`