Use OrderSortKeyword in GroupKeyword

Signed-off-by: Kamil Tekiela <[email protected]>
phpmyadmin · Nov 5, 2024 · ce86c62 · ce86c62
1 parent 913804c
commit ce86c62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Components/GroupKeyword.php b/src/Components/GroupKeyword.php
@@ -13,8 +13,7 @@
  */
 final class GroupKeyword implements Component
 {
-    /** @var 'ASC'|'DESC'|null */
-    public string|null $type = null;
+    public OrderSortKeyword|null $type = null;
 
     /**
      * The expression that is used for grouping.

diff --git a/src/Parsers/GroupKeywords.php b/src/Parsers/GroupKeywords.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\SqlParser\Parsers;
 
 use PhpMyAdmin\SqlParser\Components\GroupKeyword;
+use PhpMyAdmin\SqlParser\Components\OrderSortKeyword;
 use PhpMyAdmin\SqlParser\Parseable;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\TokensList;
@@ -66,7 +67,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     ($token->type === TokenType::Keyword)
                     && (($token->keyword === 'ASC') || ($token->keyword === 'DESC'))
                 ) {
-                    $expr->type = $token->keyword;
+                    $expr->type = OrderSortKeyword::from($token->keyword);
                 } elseif (($token->type === TokenType::Operator) && ($token->value === ',')) {
                     if (! empty($expr->expr)) {
                         $ret[] = $expr;