Merge pull request #19952 from kamil-tekiela/ParseAnalyze

MauricioFauth · web-flow · commit f3ce0982f770 · 2025-12-10T19:18:42.000-03:00
Refactor ParseAnalyze
diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
@@ -585,13 +585,12 @@ public function __invoke(ServerRequest $request): Response
         //  can choke on it so avoid parsing)
         $sqlLength = mb_strlen(Current::$sqlQuery);
         if ($sqlLength <= $this->config->settings['MaxCharactersInDisplayedSQL']) {
-            [$statementInfo, Current::$database, $tableFromSql] = ParseAnalyze::sqlQuery(
+            [$statementInfo, Current::$database, $tableFromSql, $reloadNeeded] = ParseAnalyze::sqlQuery(
                 Current::$sqlQuery,
                 Current::$database,
             );
 
-            ResponseRenderer::$reload = $statementInfo->flags->reload;
-            ImportSettings::$offset = (int) $statementInfo->flags->offset;
+            ResponseRenderer::$reload = $reloadNeeded;
 
             if (Current::$table != $tableFromSql && $tableFromSql !== '') {
                 Current::$table = $tableFromSql;
@@ -611,13 +610,12 @@ public function __invoke(ServerRequest $request): Response
 
             foreach ($queriesToBeExecuted as Current::$sqlQuery) {
                 // parse sql query
-                [$statementInfo, Current::$database, $tableFromSql] = ParseAnalyze::sqlQuery(
+                [$statementInfo, Current::$database, $tableFromSql, $reloadNeeded] = ParseAnalyze::sqlQuery(
                     Current::$sqlQuery,
                     Current::$database,
                 );
 
-                ImportSettings::$offset = (int) $statementInfo->flags->offset;
-                ResponseRenderer::$reload = $statementInfo->flags->reload;
+                ResponseRenderer::$reload = $reloadNeeded;
 
                 // Check if User is allowed to issue a 'DROP DATABASE' Statement
                 if (
diff --git a/src/ParseAnalyze.php b/src/ParseAnalyze.php
@@ -4,6 +4,9 @@
 
 namespace PhpMyAdmin;
 
+use PhpMyAdmin\SqlParser\Statements\AlterStatement;
+use PhpMyAdmin\SqlParser\Statements\CreateStatement;
+use PhpMyAdmin\SqlParser\Statements\DropStatement;
 use PhpMyAdmin\SqlParser\Utils\Query;
 use PhpMyAdmin\SqlParser\Utils\StatementInfo;
 
@@ -21,15 +24,18 @@ class ParseAnalyze
      * @param string $sqlQuery the query to parse
      * @param string $db       the current database
      *
-     * @return array<int, StatementInfo|string>
-     * @psalm-return array{StatementInfo, string, string}
+     * @return array{StatementInfo, string, string, bool}
      */
     public static function sqlQuery(string $sqlQuery, string $db): array
     {
         $info = Query::getAll($sqlQuery);
 
         $table = '';
 
+        $reload = $info->statement instanceof AlterStatement
+            || $info->statement instanceof CreateStatement
+            || $info->statement instanceof DropStatement;
+
         // If the targeted table (and database) are different than the ones that is
         // currently browsed, edit `$db` and `$table` to match them so other elements
         // (page headers, links, navigation panel) can be updated properly.
@@ -55,12 +61,12 @@ public static function sqlQuery(string $sqlQuery, string $db): array
             // There is no point checking if a reloading is required if we already decided
             // to reload. Also, no reload is required for AJAX requests.
             $response = ResponseRenderer::getInstance();
-            if (! $info->flags->reload && ! $response->isAjax()) {
+            if (! $reload && ! $response->isAjax()) {
                 // NOTE: Database names are case-insensitive.
-                $info->flags->reload = strcasecmp($db, $previousDb) !== 0;
+                $reload = strcasecmp($db, $previousDb) !== 0;
             }
         }
 
-        return [$info, $db, $table];
+        return [$info, $db, $table, $reload];
     }
 }
diff --git a/tests/unit/ParseAnalyzeTest.php b/tests/unit/ParseAnalyzeTest.php
@@ -29,7 +29,7 @@ public function testSqlQuery(): void
 
         self::assertSame('sakila', $actual[1]);
         self::assertSame('actor', $actual[2]);
-        self::assertTrue($actual[0]->flags->reload);
+        self::assertTrue($actual[3]);
         self::assertNotEmpty($actual[0]->selectTables);
         self::assertSame([['actor', 'sakila']], $actual[0]->selectTables);
         self::assertNotEmpty($actual[0]->selectExpressions);
