Fixing the parser is not recognizing single chars x and y aliases or table names

Signed-off-by: iifawzi <[email protected]>

Author: iifawzi

src/Components/Expression.php

@@ -225,7 +225,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 continue;
             }
 
-            if ($token->type === Token::TYPE_KEYWORD) {
+            if ($token->type === Token::TYPE_KEYWORD && ($token->value !== 'x' && $token->value !== 'y')) {
                 if (($brackets > 0) && empty($ret->subquery) && ! empty(Parser::$STATEMENT_PARSERS[$token->keyword])) {
                     // A `(` was previously found and this keyword is the
                     // beginning of a statement, so this is a subquery.

tests/Components/ExpressionTest.php

@@ -22,6 +22,21 @@ public function testParse2(): void
         $this->assertEquals($component->expr, 'col');
     }
 
+    public function testParse3(): void
+    {
+        $component = Expression::parse(new Parser(), $this->getTokensList('col x'));
+        $this->assertEquals($component->alias, 'x');
+
+        $component = Expression::parse(new Parser(), $this->getTokensList('col y'));
+        $this->assertEquals($component->alias, 'y');
+
+        $component = Expression::parse(new Parser(), $this->getTokensList('x.col FROM (SELECT ev.col FROM ev) x'));
+        $this->assertEquals($component->table, 'x');
+
+        $component = Expression::parse(new Parser(), $this->getTokensList('y.col FROM (SELECT ev.col FROM ev) y'));
+        $this->assertEquals($component->table, 'y');
+    }
+
     /**
      * @dataProvider parseErrProvider
      */