Fix "userIdentifierOrText" to support omitting sequence after "@"

Author: JanJakes

custom-parser/grammar-factoring/MySQLParser-factored-versioned.json

@@ -28047,6 +28047,17 @@
             ]
         ]
     },
+    {
+        "name": "textOrIdentifier_zero_or_one",
+        "bnf": [
+            [
+                "textOrIdentifier"
+            ],
+            [
+                "\u03b5"
+            ]
+        ]
+    },
     {
         "name": "%userIdentifierOrText01_zero_or_one",
         "bnf": [
@@ -28063,7 +28074,7 @@
         "bnf": [
             [
                 "AT_SIGN_SYMBOL",
-                "textOrIdentifier"
+                "textOrIdentifier_zero_or_one"
             ],
             [
                 "AT_TEXT_SUFFIX"

custom-parser/grammar-factoring/MySQLParser.g4

@@ -3994,8 +3994,16 @@ replacePassword:
     REPLACE_SYMBOL textString
 ;
 
-userIdentifierOrText:
+/*userIdentifierOrText:
     textOrIdentifier (AT_SIGN_SYMBOL textOrIdentifier | AT_TEXT_SUFFIX)?
+;*/
+
+/*
+ * @FIX:
+ * Fix "userIdentifierOrText" to support omitting sequence after "@".
+ */
+userIdentifierOrText:
+    textOrIdentifier (AT_SIGN_SYMBOL textOrIdentifier? | AT_TEXT_SUFFIX)?
 ;
 
 user:

custom-parser/parser/grammar.php

@@ -288,12 +288,7 @@ fid INTEGER NOT NULL PRIMARY KEY,
 name CHARACTER VARYING(64),
 boundary POLYGON)"
 "CREATE TABLE t1 (g GEOMCOLLECTION)"
-"create user mysqltest_7@"
 "alter user mysqltest_7@ identified by 'systpass'"
-"show grants for mysqltest_7@"
-"drop user mysqltest_7@"
-"grant select on mysqltest.* to mysqltest_8@"
-"show grants for mysqltest_8@"
 "CREATE TEMPORARY TABLE t6(a INT) ENGINE = MERGE UNION = ()"
 "ALTER TABLE t6 UNION = ()"
 "ALTER TABLE mysqltest_db2.t2_2 UNION = ()"
@@ -848,9 +843,6 @@ WHERE t1.i <= SOME ( SELECT 8 UNION  SELECT 3 ) ) )"
 "SELECT JSON_VALUE('{""data"": ""2019-01-01 11:11::11""}', '$.data' RETURNING DATETIME) AS v"
 "SELECT JSON_VALUE('{""data"": ""2019-01/01""}', '$.data' RETURNING DATE) AS v"
 "SELECT JSON_VALUE('{""data"": ""10:11:12.098700    ""}', '$.data' RETURNING TIME) AS v"
-"CREATE USER user1@"
-"GRANT UPDATE (a) ON t1 TO user1@"
-"DROP USER user1@"
 "create trigger t1_whoupdated before update on t1 for each row
 begin
 declare user varchar(32);

tests/parser/data/failures.csv

@@ -1 +1 @@
-Total: 69524  |  Failures:  350 /  0%  |  Exceptions:    0 /  0%
+Total: 69524  |  Failures:  342 /  0%  |  Exceptions:    0 /  0%