create an error implicitly later …

by consuming the keywords at most once

Author: c7hm4r

src/parser.rs

@@ -1022,21 +1022,13 @@ impl Parser {
             let referred_columns = self.parse_parenthesized_column_list(Optional)?;
             let mut on_delete = None;
             let mut on_update = None;
-            while self.parse_keyword("ON") {
-                if self.parse_keyword("DELETE") {
-                    if on_delete == None {
-                        on_delete = Some(self.parse_referential_action()?);
-                    } else {
-                        return self
-                            .expected("ON DELETE option not more than once", self.peek_token());
-                    }
-                } else if self.parse_keyword("UPDATE") {
-                    if on_update == None {
-                        on_update = Some(self.parse_referential_action()?);
-                    } else {
-                        return self
-                            .expected("ON UPDATE option not more than once", self.peek_token());
-                    }
+            loop {
+                if on_delete.is_none() && self.parse_keywords(vec!["ON", "DELETE"]) {
+                    on_delete = Some(self.parse_referential_action()?);
+                } else if on_update.is_none() && self.parse_keywords(vec!["ON", "UPDATE"]) {
+                    on_update = Some(self.parse_referential_action()?);
+                } else {
+                    break;
                 }
             }
             ColumnOption::ForeignKey {

tests/sqlparser_common.rs

@@ -1015,6 +1015,32 @@ fn parse_create_table() {
         .contains("Expected column option, found: GARBAGE"));
 }
 
+#[test]
+fn parse_create_table_with_multiple_on_delete_fails() {
+    parse_sql_statements(
+        "\
+        create table X (\
+            y_id int references Y (id) \
+            on delete cascade on update cascade on delete no action\
+        )",
+    )
+    .expect_err("should have failed");
+}
+
+#[test]
+fn parse_create_table_with_on_delete_on_update_2in_any_order() -> Result<(), ParserError> {
+    let sql = |options: &str| -> String {
+        format!("create table X (y_id int references Y (id) {})", options)
+    };
+
+    parse_sql_statements(&sql("on update cascade on delete no action"))?;
+    parse_sql_statements(&sql("on delete cascade on update cascade"))?;
+    parse_sql_statements(&sql("on update no action"))?;
+    parse_sql_statements(&sql("on delete restrict"))?;
+
+    Ok(())
+}
+
 #[test]
 fn parse_create_table_with_options() {
     let sql = "CREATE TABLE t (c int) WITH (foo = 'bar', a = 123)";