Add missing branches to “accountLockPasswordExpireOptions”

Author: JanJakes

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

@@ -13226,6 +13226,14 @@
             [
                 "PASSWORD_SYMBOL",
                 "%accountLockPasswordExpireOptions11"
+            ],
+            [
+                "PASSWORD_LOCK_TIME_SYMBOL",
+                "%accountLockPasswordExpireOptions21"
+            ],
+            [
+                "FAILED_LOGIN_ATTEMPTS_SYMBOL",
+                "real_ulong_number"
             ]
         ]
     },
@@ -13366,6 +13374,17 @@
             ]
         ]
     },
+    {
+        "name": "%accountLockPasswordExpireOptions21",
+        "bnf": [
+            [
+                "real_ulong_number"
+            ],
+            [
+                "UNBOUNDED_SYMBOL"
+            ]
+        ]
+    },
     {
         "name": "%dropUser02_zero_or_one",
         "bnf": [

custom-parser/grammar-factoring/MySQLParser.g4

@@ -1905,6 +1905,31 @@ connectOptions:
     )+
 ;
 
+/*accountLockPasswordExpireOptions:
+    ACCOUNT_SYMBOL (LOCK_SYMBOL | UNLOCK_SYMBOL)
+    | PASSWORD_SYMBOL (
+        EXPIRE_SYMBOL (
+            INTERVAL_SYMBOL real_ulong_number DAY_SYMBOL
+            | NEVER_SYMBOL
+            | DEFAULT_SYMBOL
+        )?
+        | HISTORY_SYMBOL (real_ulong_number | DEFAULT_SYMBOL)
+        | REUSE_SYMBOL INTERVAL_SYMBOL (
+            real_ulong_number DAY_SYMBOL
+            | DEFAULT_SYMBOL
+        )
+        | {serverVersion >= 80014}? REQUIRE_SYMBOL CURRENT_SYMBOL (
+            DEFAULT_SYMBOL
+            | OPTIONAL_SYMBOL
+        )?
+    )
+    |
+;*/
+
+/*
+ * @FIX:
+ * Add missing "PASSWORD_LOCK_TIME_SYMBOL" and "FAILED_LOGIN_ATTEMPTS_SYMBOL".
+ */
 accountLockPasswordExpireOptions:
     ACCOUNT_SYMBOL (LOCK_SYMBOL | UNLOCK_SYMBOL)
     | PASSWORD_SYMBOL (
@@ -1923,6 +1948,8 @@ accountLockPasswordExpireOptions:
             | OPTIONAL_SYMBOL
         )?
     )
+    | PASSWORD_LOCK_TIME_SYMBOL (real_ulong_number | UNBOUNDED_SYMBOL)
+    | FAILED_LOGIN_ATTEMPTS_SYMBOL real_ulong_number
 ;
 
 dropUser:

custom-parser/parser/grammar.php

@@ -916,28 +916,8 @@ UNION
 ORDER BY c2 DESC, c1 ASC LIMIT 1
 ) AS res"
 "((SELECT SQL_CALC_FOUND_ROWS * FROM r ORDER BY a LIMIT 5) ORDER BY -a LIMIT 4) ORDER BY a LIMIT 3"
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 4 PASSWORD_LOCK_TIME 6"
-"ALTER USER foo@localhost FAILED_LOGIN_ATTEMPTS 2"
-"ALTER USER foo@localhost PASSWORD_LOCK_TIME 3"
-"CREATE USER foo@localhost FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"CREATE USER failed_login_attempts@localhost FAILED_LOGIN_ATTEMPTS 2"
-"CREATE USER password_lock_time@localhost PASSWORD_LOCK_TIME 3"
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"ALTER USER foo@localhost FAILED_LOGIN_ATTEMPTS 0"
-"ALTER USER foo@localhost FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 0"
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3 ACCOUNT LOCK"
-"CREATE USER proxied_to_user@localhost IDENTIFIED WITH 'mysql_native_password' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"CREATE USER proxy_user@localhost IDENTIFIED WITH 'mysql_native_password' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 2"
-"ALTER USER u1 FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"ALTER USER u1 FAILED_LOGIN_ATTEMPTS 0 PASSWORD_LOCK_TIME 0"
-"CREATE USER foo@localhost FAILED_LOGIN_ATTEMPTS 32767"
-"CREATE USER foo@localhost PASSWORD_LOCK_TIME 32767"
-"CREATE USER ''@localhost IDENTIFIED BY 'pwd' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME 3"
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' PASSWORD_LOCK_TIME 3 FAILED_LOGIN_ATTEMPTS 2"
 "ALTER USER foo@localhost ATTRIBUTE ""{ \"test\": \"account locking\" }"""
 "ALTER USER foo@localhost COMMENT ""This is a test account for verifying that password locking and user attributes won't interfer with one and another."""
-"CREATE USER foo@localhost IDENTIFIED BY 'foo' FAILED_LOGIN_ATTEMPTS 2 PASSWORD_LOCK_TIME UNBOUNDED"
 "ALTER USER u1 COMMENT 'free form text'"
 "ALTER USER u1 COMMENT 'changed the free form text'"
 "ALTER USER u1 ATTRIBUTE '{""uid"" : ""34234""}'"

tests/parser/data/failures.csv

@@ -1 +1 @@
-Total: 69524  |  Failures:  412 /  0%  |  Exceptions:    0 /  0%
+Total: 69524  |  Failures:  392 /  0%  |  Exceptions:    0 /  0%