Merge #20266 - Fix #20041 - Fix export for raw queries without table reference

williamdes · williamdes · commit 0eab757cba80 · 2026-04-09T12:01:05.000+02:00
Pull-request: #20266 Fixes: #20041 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -15054,7 +15054,7 @@ parameters:
 				Use dependency injection instead\.$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 1
+			count: 2
 			path: tests/unit/Controllers/Table/ExportControllerTest.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2128,24 +2128,12 @@
     </RiskyTruthyFalsyComparison>
   </file>
   <file src="src/Controllers/Table/ExportController.php">
-    <MixedArgument>
-      <code><![CDATA[Current::$database]]></code>
-      <code><![CDATA[Current::$table]]></code>
-    </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code><![CDATA[Current::$whereClause]]></code>
     </MixedArgumentTypeCoercion>
-    <MixedPropertyTypeCoercion>
-      <code><![CDATA[UrlParams::$params]]></code>
-      <code><![CDATA[UrlParams::$params]]></code>
-      <code><![CDATA[['db' => Current::$database, 'table' => Current::$table]]]></code>
-    </MixedPropertyTypeCoercion>
     <PossiblyNullArgument>
       <code><![CDATA[$parser->list]]></code>
     </PossiblyNullArgument>
-    <PossiblyUnusedReturnValue>
-      <code><![CDATA[Response]]></code>
-    </PossiblyUnusedReturnValue>
   </file>
   <file src="src/Controllers/Table/ExportRowsController.php">
     <InvalidPropertyAssignmentValue>
@@ -9431,6 +9419,7 @@
   <file src="tests/unit/Controllers/Table/ExportControllerTest.php">
     <DeprecatedMethod>
       <code><![CDATA[Config::getInstance()]]></code>
+      <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
   </file>
   <file src="tests/unit/Controllers/Table/ImportControllerTest.php">
diff --git a/src/Controllers/Table/ExportController.php b/src/Controllers/Table/ExportController.php
@@ -45,11 +45,13 @@ public function __invoke(ServerRequest $request): Response
 
         $this->response->addScriptFiles(['export.js']);
 
-        if (Current::$database === '') {
+        $isRawQuery = $request->has('raw_query');
+
+        if (Current::$database === '' && ! $isRawQuery) {
             return $this->response->missingParameterError('db');
         }
 
-        if (Current::$table === '') {
+        if (Current::$table === '' && ! $isRawQuery) {
             return $this->response->missingParameterError('table');
         }
 
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -3457,7 +3457,7 @@ private function getResultsOperations(
              * first table of this database, so that /table/export and
              * the script it calls do not fail
              */
-            if ($urlParams['table'] === '' && $urlParams['db'] !== '') {
+            if (! isset($urlParams['raw_query']) && $urlParams['table'] === '' && $urlParams['db'] !== '') {
                 $urlParams['table'] = (string) $this->dbi->fetchValue('SHOW TABLES');
             }
 
diff --git a/tests/unit/Controllers/Table/ExportControllerTest.php b/tests/unit/Controllers/Table/ExportControllerTest.php
@@ -124,4 +124,39 @@ public function testExportController(): void
         (new ExportController($response, $options, $pageSettings))(self::createStub(ServerRequest::class));
         self::assertSame($expected, $response->getHTMLResult());
     }
+
+    public function testExportControllerWithRawQuery(): void
+    {
+        Current::$database = '';
+        Current::$table = '';
+        Current::$sqlQuery = 'SELECT 1 as foo';
+        $config = Config::getInstance();
+        $config->selectedServer = $config->getSettings()->Servers[1]->asArray();
+
+        $dbi = $this->createDatabaseInterface();
+        DatabaseInterface::$instance = $dbi;
+
+        $response = new ResponseRenderer();
+        $relation = new Relation($dbi, $config);
+        $template = new Template($config);
+        $userPreferences = new UserPreferences($dbi, $relation, $template, $config, new Clock());
+        $pageSettings = new PageSettings($userPreferences, $response);
+
+        $userPreferencesHandler = new UserPreferencesHandler(
+            $config,
+            $dbi,
+            $userPreferences,
+            new LanguageManager($config),
+            new ThemeManager(),
+        );
+        $options = new Options($relation, new TemplateModel($dbi), $userPreferencesHandler);
+
+        $request = self::createStub(ServerRequest::class);
+        $request->method('has')->willReturnMap([['raw_query', true], ['single_table', false]]);
+
+        $result = (new ExportController($response, $options, $pageSettings))($request);
+
+        // Should return 200 instead of 400 for missing db/table params
+        self::assertSame(200, $result->getStatusCode());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15054,7 +15054,7 @@ parameters:`
`15054`	`15054`	`Use dependency injection instead\.$#`
`15055`	`15055`	`'''`
`15056`	`15056`	`identifier: staticMethod.deprecated`
`15057`		`- count: 1`
	`15057`	`+ count: 2`
`15058`	`15058`	`path: tests/unit/Controllers/Table/ExportControllerTest.php`
`15059`	`15059`
`15060`	`15060`	`-`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,13 @@ public function __invoke(ServerRequest $request): Response`
`45`	`45`
`46`	`46`	`$this->response->addScriptFiles(['export.js']);`
`47`	`47`
`48`		`- if (Current::$database === '') {`
	`48`	`+ $isRawQuery = $request->has('raw_query');`
	`49`	`+`
	`50`	`+ if (Current::$database === '' && ! $isRawQuery) {`
`49`	`51`	`return $this->response->missingParameterError('db');`
`50`	`52`	`}`
`51`	`53`
`52`		`- if (Current::$table === '') {`
	`54`	`+ if (Current::$table === '' && ! $isRawQuery) {`
`53`	`55`	`return $this->response->missingParameterError('table');`
`54`	`56`	`}`
`55`	`57`
Original file line number	Diff line number	Diff line change
`@@ -3457,7 +3457,7 @@ private function getResultsOperations(`
`3457`	`3457`	`* first table of this database, so that /table/export and`
`3458`	`3458`	`* the script it calls do not fail`
`3459`	`3459`	`*/`
`3460`		`- if ($urlParams['table'] === '' && $urlParams['db'] !== '') {`
	`3460`	`+ if (! isset($urlParams['raw_query']) && $urlParams['table'] === '' && $urlParams['db'] !== '') {`
`3461`	`3461`	`$urlParams['table'] = (string) $this->dbi->fetchValue('SHOW TABLES');`
`3462`	`3462`	`}`
`3463`	`3463`