fix table alias regexp in QueryHelper#cleanUpTableNames() (#371)

* fix table alias regexp in QueryHelper#cleanUpTableNames() Co-authored-by: Márton Somogyi <somogyi.marton@metrisoft.hu>
yiisoft · Oct 15, 2022 · d1a99ef · d1a99ef
1 parent eb6f754
commit d1a99ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Query/Helper/QueryHelper.php b/src/Query/Helper/QueryHelper.php
@@ -39,7 +39,7 @@ public function cleanUpTableNames(array $tableNames, QuoterInterface $quoter): a
     {
         $cleanedUpTableNames = [];
         $pattern = <<<PATTERN
-        ~^\s*((?:['"`\[]|{{).*?(?:['"`\]]|}})|\(.*?\)|.*?)(?:(?:\s+(?:as)?\s*)((?:['"`\[]|{{).*?(?:['"`\]]|}})|.*?))?\s*$~iux
+        ~^\s*((?:['"`\[]|{{).*?(?:['"`\]]|}})|\(.*?\)|.*?)(?:(?:\s+(?:as\s+)?)((?:['"`\[]|{{).*?(?:['"`\]]|}})|.*?))?\s*$~iux
         PATTERN;
 
         /** @psalm-var array<array-key, Expression|string> $tableNames */

diff --git a/tests/QueryHelperTest.php b/tests/QueryHelperTest.php
@@ -18,6 +18,7 @@ public function tablesNameDataProvider(): array
         return [
             [['customer'], '', ['{{customer}}' => '{{customer}}']],
             [['profile AS "prf"'], '', ['{{prf}}' => '{{profile}}']],
+            [['mainframe as400'], '', ['{{as400}}' => '{{mainframe}}']],
             [
                 ['x' => new Expression('(SELECT id FROM user)')],
                 '',