Create OrderSortKeyword

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

Hide file tree

Showing 19 changed files with 111 additions and 26 deletions.
diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php
@@ -19,21 +19,21 @@ final class OrderKeyword implements Component
     /**
      * The order type.
      */
-    public string $type;
+    public OrderSortKeyword $type;
 
     /**
-     * @param Expression|null $expr the expression that we are sorting by
-     * @param string          $type the sorting type
+     * @param Expression|null  $expr the expression that we are sorting by
+     * @param OrderSortKeyword $type the sorting type
      */
-    public function __construct(Expression|null $expr = null, string $type = 'ASC')
+    public function __construct(Expression|null $expr = null, OrderSortKeyword $type = OrderSortKeyword::Asc)
     {
         $this->expr = $expr;
         $this->type = $type;
     }
 
     public function build(): string
     {
-        return $this->expr . ' ' . $this->type;
+        return $this->expr . ' ' . $this->type->value;
     }
 
     public function __toString(): string

diff --git a/src/Components/OrderSortKeyword.php b/src/Components/OrderSortKeyword.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\SqlParser\Components;
+
+enum OrderSortKeyword: string
+{
+    case Asc = 'ASC';
+    case Desc = 'DESC';
+}
diff --git a/src/Parsers/OrderKeywords.php b/src/Parsers/OrderKeywords.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\SqlParser\Parsers;
 
 use PhpMyAdmin\SqlParser\Components\OrderKeyword;
+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;

diff --git a/tests/Components/OrderKeywordTest.php b/tests/Components/OrderKeywordTest.php
@@ -6,6 +6,7 @@
 
 use PhpMyAdmin\SqlParser\Components\Expression;
 use PhpMyAdmin\SqlParser\Components\OrderKeyword;
+use PhpMyAdmin\SqlParser\Components\OrderSortKeyword;
 use PhpMyAdmin\SqlParser\Parsers\OrderKeywords;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
 
@@ -17,8 +18,8 @@ public function testBuildAll(): void
             'a ASC, b DESC',
             OrderKeywords::buildAll(
                 [
-                    new OrderKeyword(new Expression('a'), 'ASC'),
-                    new OrderKeyword(new Expression('b'), 'DESC'),
+                    new OrderKeyword(new Expression('a'), OrderSortKeyword::Asc),
+                    new OrderKeyword(new Expression('b'), OrderSortKeyword::Desc),
                 ],
             ),
         );

diff --git a/tests/data/parser/parseDelete.out b/tests/data/parser/parseDelete.out
@@ -547,7 +547,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseDelete4.out b/tests/data/parser/parseDelete4.out
@@ -277,7 +277,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseDelete5.out b/tests/data/parser/parseDelete5.out
@@ -343,7 +343,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": {

diff --git a/tests/data/parser/parseDelete6.out b/tests/data/parser/parseDelete6.out
@@ -197,7 +197,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseDelete7.out b/tests/data/parser/parseDelete7.out
@@ -267,7 +267,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": {

diff --git a/tests/data/parser/parseDeleteErr5.out b/tests/data/parser/parseDeleteErr5.out
@@ -365,7 +365,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseDeleteErr7.out b/tests/data/parser/parseDeleteErr7.out
@@ -345,7 +345,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseSelect.out b/tests/data/parser/parseSelect.out
@@ -1037,7 +1037,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "DESC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Desc",
+                            "value": "DESC"
+                        }
                     },
                     {
                         "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderKeyword",
@@ -1051,7 +1055,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": {

diff --git a/tests/data/parser/parseSelect13.out b/tests/data/parser/parseSelect13.out
@@ -11992,7 +11992,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseSelect9.out b/tests/data/parser/parseSelect9.out
@@ -949,7 +949,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseSelectErr1.out b/tests/data/parser/parseSelectErr1.out
@@ -983,7 +983,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "DESC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Desc",
+                            "value": "DESC"
+                        }
                     },
                     {
                         "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderKeyword",
@@ -997,7 +1001,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": {

diff --git a/tests/data/parser/parseSelectGroupBy.out b/tests/data/parser/parseSelectGroupBy.out
@@ -1636,7 +1636,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": {

diff --git a/tests/data/parser/parseSelectOrderByComment.out b/tests/data/parser/parseSelectOrderByComment.out
@@ -300,7 +300,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseSelectOrderByIsNull.out b/tests/data/parser/parseSelectOrderByIsNull.out
@@ -267,7 +267,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,

diff --git a/tests/data/parser/parseSelectUnion2.out b/tests/data/parser/parseSelectUnion2.out
@@ -1289,7 +1289,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     },
                     {
                         "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderKeyword",
@@ -1303,7 +1307,11 @@
                             "function": null,
                             "subquery": null
                         },
-                        "type": "ASC"
+                        "type": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\OrderSortKeyword",
+                            "name": "Asc",
+                            "value": "ASC"
+                        }
                     }
                 ],
                 "limit": null,