Merge pull request #542 from MauricioFauth/fix/issue-496

Fix keywords not being recognized as table alias
phpmyadmin · Jan 20, 2024 · c644e93 · c644e93
2 parents daffc4e + 716d545
commit c644e93
Show file tree

Hide file tree

Showing 10 changed files with 469 additions and 30 deletions.
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -237,11 +237,7 @@ class AlterOperation extends Component
         'ON COMPLETION PRESERVE' => 5,
         'ON COMPLETION NOT PRESERVE' => 5,
         'RENAME' => 6,
-        'TO' => [
-            7,
-            'expr',
-            ['parseField' => 'table'],
-        ],
+        'TO' => [7, 'expr', ['parseField' => 'table', 'breakOnAlias' => true]],
         'ENABLE' => 8,
         'DISABLE' => 8,
         'DISABLE ON SLAVE' => 8,

diff --git a/src/Components/Expression.php b/src/Components/Expression.php
@@ -273,7 +273,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     }
 
                     $isExpr = true;
-                } elseif ($brackets === 0 && strlen((string) $ret->expr) > 0 && ! $alias) {
+                } elseif (
+                    $brackets === 0 && strlen((string) $ret->expr) > 0 && ! $alias
+                    && ($ret->table === null || $ret->table === '')
+                ) {
                     /* End of expression */
                     break;
                 }

diff --git a/src/Statements/LoadStatement.php b/src/Statements/LoadStatement.php
@@ -293,7 +293,7 @@ public function parse(Parser $parser, TokensList $list)
                 }
 
                 ++$list->idx;
-                $this->table = Expression::parse($parser, $list, ['parseField' => 'table']);
+                $this->table = Expression::parse($parser, $list, ['parseField' => 'table', 'breakOnAlias' => true]);
                 $state = 3;
             } elseif ($state >= 3 && $state <= 7) {
                 if ($token->type === Token::TYPE_KEYWORD) {

diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php
@@ -35,6 +35,7 @@ public function bugProvider(): array
             ['bugs/gh412'],
             ['bugs/gh478'],
             ['bugs/gh492'],
+            ['bugs/gh496'],
             ['bugs/gh498'],
             ['bugs/gh499'],
             ['bugs/gh508'],

diff --git a/tests/Utils/ErrorTest.php b/tests/Utils/ErrorTest.php
@@ -38,8 +38,12 @@ public function testGetWithNullToken(): void
     {
         $lexer = new Lexer('LOCK TABLES table1 AS `t1` LOCAL');
         $parser = new Parser($lexer->list);
-        $this->assertEquals(
-            [['Unexpected keyword.', 0, 'LOCAL', 27], ['Unexpected end of LOCK expression.', 0, null, null]],
+        $this->assertSame(
+            [
+                ['An alias was previously found.', 0, 'LOCAL', 27],
+                ['Unexpected keyword.', 0, 'LOCAL', 27],
+                ['Unexpected end of LOCK expression.', 0, '', null],
+            ],
             Error::get([$lexer, $parser])
         );
     }

diff --git a/tests/data/bugs/gh496.in b/tests/data/bugs/gh496.in
@@ -0,0 +1,3 @@
+SELECT  COUNT(*) AS amount
+FROM    one i
+JOIN    two io ON io.id = i.id