Tiny improvement to handle the columns if backtick is used

Example: SELECT `test3`.`t1` is not null AS `is_not_null` FROM `test3`

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

Author: iifawzi

src/Components/Expression.php

@@ -379,12 +379,15 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     --$list->idx;
                     $beforeToken = $list->getPrevious();
                     $list->idx = $currIdx;
-                    // columns names tokens are of type NONE, and the columns options
+                    // columns names tokens are of type NONE, or SYMBOL (`col`), and the columns options
                     // would start with a token of type KEYWORD, in that case, we want to have a space
                     // between the tokens.
                     if (
-                        $ret->expr !== null && $beforeToken &&
-                        $beforeToken->type === Token::TYPE_NONE && $token->type === Token::TYPE_KEYWORD
+                        $ret->expr !== null &&
+                        $beforeToken &&
+                        ($beforeToken->type === Token::TYPE_NONE ||
+                        $beforeToken->type === Token::TYPE_SYMBOL) &&
+                        $token->type === Token::TYPE_KEYWORD
                     ) {
                         $ret->expr = rtrim($ret->expr, ' ') . ' ';
                     }

tests/Builder/SelectStatementTest.php

@@ -37,10 +37,10 @@ public function testBuilderUnion(): void
 
     public function testBuilderWithIsNull(): void
     {
-        $parser = new Parser('SELECT test3.t1 is not null AS `col1` FROM test3');
+        $parser = new Parser('SELECT `test3`.`t1` is not null AS `is_not_null` FROM `test3` ;');
         $stmt = $parser->statements[0];
 
-        $this->assertEquals('SELECT test3.t1 is not null AS `col1` FROM test3', $stmt->build());
+        $this->assertEquals('SELECT `test3`.`t1` is not null AS `is_not_null` FROM `test3`', $stmt->build());
 
         $parser = new Parser('SELECT test3.t1 is null AS `col1` FROM test3');
         $stmt = $parser->statements[0];