Fix bind parameter in LIMIT OFFSET

- Fixes #498 Signed-off-by: Maurício Meneghini Fauth <[email protected]>
phpmyadmin · Sep 27, 2023 · 38444dc · 38444dc
1 parent 349a811
commit 38444dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 31 deletions.
diff --git a/src/Components/Limit.php b/src/Components/Limit.php
@@ -19,20 +19,20 @@ class Limit extends Component
     /**
      * The number of rows skipped.
      *
-     * @var int
+     * @var int|string
      */
     public $offset;
 
     /**
      * The number of rows to be returned.
      *
-     * @var int
+     * @var int|string
      */
     public $rowCount;
 
     /**
-     * @param int $rowCount the row count
-     * @param int $offset   the offset
+     * @param int|string $rowCount the row count
+     * @param int|string $offset   the offset
      */
     public function __construct($rowCount = 0, $offset = 0)
     {
@@ -88,8 +88,11 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 continue;
             }
 
-            // Skip if not a number
-            if (($token->type !== Token::TYPE_NUMBER)) {
+            // Skip if not a number or a bind parameter (?)
+            if (
+                ! ($token->type === Token::TYPE_NUMBER
+                    || ($token->type === Token::TYPE_SYMBOL && ($token->flags & Token::FLAG_SYMBOL_PARAMETER)))
+            ) {
                 break;
             }
 

diff --git a/tests/data/bugs/gh498.out b/tests/data/bugs/gh498.out
@@ -346,8 +346,8 @@
                 "order": null,
                 "limit": {
                     "@type": "PhpMyAdmin\\SqlParser\\Components\\Limit",
-                    "offset": 0,
-                    "rowCount": 0
+                    "offset": "?",
+                    "rowCount": "?"
                 },
                 "procedure": null,
                 "into": null,
@@ -396,28 +396,6 @@
     },
     "errors": {
         "lexer": [],
-        "parser": [
-            [
-                "Unexpected token.",
-                {
-                    "@type": "@28"
-                },
-                0
-            ],
-            [
-                "Unrecognized keyword.",
-                {
-                    "@type": "@30"
-                },
-                0
-            ],
-            [
-                "Unexpected token.",
-                {
-                    "@type": "@32"
-                },
-                0
-            ]
-        ]
+        "parser": []
     }
 }