Fix date and time literals by reordering grammar rules

WordPress · Oct 3, 2024 · 4eee991 · 4eee991
1 parent f658751
commit 4eee991
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 489 deletions.
diff --git a/custom-parser/grammar-factoring/MySQLParser-factored.json b/custom-parser/grammar-factoring/MySQLParser-factored.json
@@ -22902,6 +22902,9 @@
   {
     "name": "%simpleExpr_factored",
     "bnf": [
+      [
+        "literal"
+      ],
       [
         "%%simpleExpr_factored1158"
       ],
@@ -22914,9 +22917,6 @@
       [
         "%%simpleExpr_factored1160"
       ],
-      [
-        "literal"
-      ],
       [
         "PARAM_MARKER"
       ],

diff --git a/custom-parser/grammar-factoring/MySQLParser-manually-factored.ebnf b/custom-parser/grammar-factoring/MySQLParser-manually-factored.ebnf
@@ -681,5 +681,7 @@ bitExpr ::= simpleExpr %bitExpr_rr*
 
 simpleExpr ::= %simpleExpr_collate (CONCAT_PIPES_SYMBOL %simpleExpr_collate)*
 %simpleExpr_collate ::= %simpleExpr_factored (COLLATE_SYMBOL textOrIdentifier)?
-%simpleExpr_factored ::= (variable (equal expr)?) | functionCall | runtimeFunctionCall | (columnRef jsonOperator?) | literal | PARAM_MARKER | sumExpr | groupingOperation | windowFunctionCall | ((PLUS_OPERATOR | MINUS_OPERATOR | BITWISE_NOT_OPERATOR) simpleExpr) | (not2Rule simpleExpr) | (ROW_SYMBOL? OPEN_PAR_SYMBOL exprList CLOSE_PAR_SYMBOL) | (EXISTS_SYMBOL? subquery) | (OPEN_CURLY_SYMBOL identifier expr CLOSE_CURLY_SYMBOL) | (MATCH_SYMBOL identListArg AGAINST_SYMBOL OPEN_PAR_SYMBOL bitExpr fulltextOptions? CLOSE_PAR_SYMBOL) | (BINARY_SYMBOL simpleExpr) | (CAST_SYMBOL OPEN_PAR_SYMBOL expr AS_SYMBOL castType arrayCast? CLOSE_PAR_SYMBOL) | (CASE_SYMBOL expr? (whenExpression thenExpression)+ elseExpression? END_SYMBOL) | (CONVERT_SYMBOL OPEN_PAR_SYMBOL expr COMMA_SYMBOL castType CLOSE_PAR_SYMBOL) | (CONVERT_SYMBOL OPEN_PAR_SYMBOL expr USING_SYMBOL charsetName CLOSE_PAR_SYMBOL) | (DEFAULT_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL) | (VALUES_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL) | (INTERVAL_SYMBOL expr interval PLUS_OPERATOR expr)
+
+/* In addition to factoring left recursion, reorder to fix date and time literals (DATE '...', TIME '...', TIMESTAMP '...'). */
+%simpleExpr_factored ::= literal | (variable (equal expr)?) | functionCall | runtimeFunctionCall | (columnRef jsonOperator?) | PARAM_MARKER | sumExpr | groupingOperation | windowFunctionCall | ((PLUS_OPERATOR | MINUS_OPERATOR | BITWISE_NOT_OPERATOR) simpleExpr) | (not2Rule simpleExpr) | (ROW_SYMBOL? OPEN_PAR_SYMBOL exprList CLOSE_PAR_SYMBOL) | (EXISTS_SYMBOL? subquery) | (OPEN_CURLY_SYMBOL identifier expr CLOSE_CURLY_SYMBOL) | (MATCH_SYMBOL identListArg AGAINST_SYMBOL OPEN_PAR_SYMBOL bitExpr fulltextOptions? CLOSE_PAR_SYMBOL) | (BINARY_SYMBOL simpleExpr) | (CAST_SYMBOL OPEN_PAR_SYMBOL expr AS_SYMBOL castType arrayCast? CLOSE_PAR_SYMBOL) | (CASE_SYMBOL expr? (whenExpression thenExpression)+ elseExpression? END_SYMBOL) | (CONVERT_SYMBOL OPEN_PAR_SYMBOL expr COMMA_SYMBOL castType CLOSE_PAR_SYMBOL) | (CONVERT_SYMBOL OPEN_PAR_SYMBOL expr USING_SYMBOL charsetName CLOSE_PAR_SYMBOL) | (DEFAULT_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL) | (VALUES_SYMBOL OPEN_PAR_SYMBOL simpleIdentifier CLOSE_PAR_SYMBOL) | (INTERVAL_SYMBOL expr interval PLUS_OPERATOR expr)
 
diff --git a/custom-parser/grammar-factoring/MySQLParser-manually-factored.json b/custom-parser/grammar-factoring/MySQLParser-manually-factored.json
@@ -24079,6 +24079,9 @@
   {
     "name": "%simpleExpr_factored",
     "bnf": [
+      [
+        "literal"
+      ],
       [
         "%%simpleExpr_factored1158"
       ],
@@ -24091,9 +24094,6 @@
       [
         "%%simpleExpr_factored1160"
       ],
-      [
-        "literal"
-      ],
       [
         "PARAM_MARKER"
       ],

diff --git a/custom-parser/parser/grammar.php b/custom-parser/parser/grammar.php