Introduced TriggerObjectKind and removed include_each in CreateTrigger

LucaCappelletti94 · LucaCappelletti94 · commit c893bda671a2 · 2025-09-24T11:53:47.000+02:00
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
@@ -3178,6 +3178,26 @@ impl Spanned for RenameTableNameKind {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+/// Whether the syntax used for the trigger object (ROW or STATEMENT) is `FOR` or `FOR EACH`.
+pub enum TriggerObjectKind {
+    /// The `FOR` syntax is used.
+    For(TriggerObject),
+    /// The `FOR EACH` syntax is used.
+    ForEach(TriggerObject),
+}
+
+impl Display for TriggerObjectKind {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            TriggerObjectKind::For(obj) => write!(f, "FOR {obj}"),
+            TriggerObjectKind::ForEach(obj) => write!(f, "FOR EACH {obj}"),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
@@ -3282,9 +3302,7 @@ pub struct CreateTrigger {
     /// every row affected by the trigger event, or just once per SQL statement.
     /// This is optional in some SQL dialects, such as SQLite, and if not specified, in
     /// those cases, the implied default is `FOR EACH ROW`.
-    pub trigger_object: Option<TriggerObject>,
-    /// Whether to include the `EACH` term of the `FOR EACH`, as it is optional syntax.
-    pub include_each: bool,
+    pub trigger_object: Option<TriggerObjectKind>,
     ///  Triggering conditions
     pub condition: Option<Expr>,
     /// Execute logic block
@@ -3313,7 +3331,6 @@ impl Display for CreateTrigger {
             referencing,
             trigger_object,
             condition,
-            include_each,
             exec_body,
             statements_as,
             statements,
@@ -3355,11 +3372,7 @@ impl Display for CreateTrigger {
         }
 
         if let Some(trigger_object) = trigger_object {
-            if *include_each {
-                write!(f, " FOR EACH {trigger_object}")?;
-            } else if exec_body.is_some() {
-                write!(f, " FOR {trigger_object}")?;
-            }
+            write!(f, " {trigger_object}")?;
         }
         if let Some(condition) = condition {
             write!(f, " WHEN {condition}")?;
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -69,8 +69,8 @@ pub use self::ddl::{
     IdentityProperty, IdentityPropertyFormatKind, IdentityPropertyKind, IdentityPropertyOrder,
     IndexColumn, IndexOption, IndexType, KeyOrIndexDisplay, NullsDistinctOption, Owner, Partition,
     ProcedureParam, ReferentialAction, RenameTableNameKind, ReplicaIdentity, TableConstraint,
-    TagsColumnOption, UserDefinedTypeCompositeAttributeDef, UserDefinedTypeRepresentation,
-    ViewColumnDef,
+    TagsColumnOption, TriggerObjectKind, UserDefinedTypeCompositeAttributeDef,
+    UserDefinedTypeRepresentation, ViewColumnDef,
 };
 pub use self::dml::{Delete, Insert};
 pub use self::operator::{BinaryOperator, UnaryOperator};
diff --git a/src/dialect/mssql.rs b/src/dialect/mssql.rs
@@ -18,7 +18,7 @@
 use crate::ast::helpers::attached_token::AttachedToken;
 use crate::ast::{
     BeginEndStatements, ConditionalStatementBlock, ConditionalStatements, CreateTrigger,
-    GranteesType, IfStatement, Statement, TriggerObject,
+    GranteesType, IfStatement, Statement,
 };
 use crate::dialect::Dialect;
 use crate::keywords::{self, Keyword};
@@ -264,8 +264,7 @@ impl MsSqlDialect {
             table_name,
             referenced_table_name: None,
             referencing: Vec::new(),
-            trigger_object: Some(TriggerObject::Statement),
-            include_each: false,
+            trigger_object: None,
             condition: None,
             exec_body: None,
             statements_as: true,
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -5609,23 +5609,26 @@ impl<'a> Parser<'a> {
             }
         }
 
-        let (include_each, trigger_object) = if self.parse_keyword(Keyword::FOR) {
-            (
-                self.parse_keyword(Keyword::EACH),
-                Some(
-                    match self.expect_one_of_keywords(&[Keyword::ROW, Keyword::STATEMENT])? {
-                        Keyword::ROW => TriggerObject::Row,
-                        Keyword::STATEMENT => TriggerObject::Statement,
-                        _ => unreachable!(),
-                    },
-                ),
-            )
+        let trigger_object = if self.parse_keyword(Keyword::FOR) {
+            let include_each = self.parse_keyword(Keyword::EACH);
+            let trigger_object =
+                match self.expect_one_of_keywords(&[Keyword::ROW, Keyword::STATEMENT])? {
+                    Keyword::ROW => TriggerObject::Row,
+                    Keyword::STATEMENT => TriggerObject::Statement,
+                    _ => unreachable!(),
+                };
+
+            Some(if include_each {
+                TriggerObjectKind::ForEach(trigger_object)
+            } else {
+                TriggerObjectKind::For(trigger_object)
+            })
         } else {
             if !dialect_of!(self is SQLiteDialect ) {
                 self.expect_keyword_is(Keyword::FOR)?;
             }
 
-            (false, None)
+            None
         };
 
         let condition = self
@@ -5654,7 +5657,6 @@ impl<'a> Parser<'a> {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body,
             statements_as: false,
diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs
@@ -2396,8 +2396,7 @@ fn parse_create_trigger() {
             table_name: ObjectName::from(vec![Ident::new("Sales"), Ident::new("Customer")]),
             referenced_table_name: None,
             referencing: vec![],
-            trigger_object: Some(TriggerObject::Statement),
-            include_each: false,
+            trigger_object: None,
             condition: None,
             exec_body: None,
             statements_as: true,
diff --git a/tests/sqlparser_mysql.rs b/tests/sqlparser_mysql.rs
@@ -3934,8 +3934,7 @@ fn parse_create_trigger() {
             table_name: ObjectName::from(vec![Ident::new("emp")]),
             referenced_table_name: None,
             referencing: vec![],
-            trigger_object: Some(TriggerObject::Row),
-            include_each: true,
+            trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
             condition: None,
             exec_body: Some(TriggerExecBody {
                 exec_type: TriggerExecBodyType::Function,
diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -5683,8 +5683,7 @@ fn parse_create_simple_before_insert_trigger() {
         table_name: ObjectName::from(vec![Ident::new("accounts")]),
         referenced_table_name: None,
         referencing: vec![],
-        trigger_object: Some(TriggerObject::Row),
-        include_each: true,
+        trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
         condition: None,
         exec_body: Some(TriggerExecBody {
             exec_type: TriggerExecBodyType::Function,
@@ -5716,8 +5715,7 @@ fn parse_create_after_update_trigger_with_condition() {
         table_name: ObjectName::from(vec![Ident::new("accounts")]),
         referenced_table_name: None,
         referencing: vec![],
-        trigger_object: Some(TriggerObject::Row),
-        include_each: true,
+        trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
         condition: Some(Expr::Nested(Box::new(Expr::BinaryOp {
             left: Box::new(Expr::CompoundIdentifier(vec![
                 Ident::new("NEW"),
@@ -5756,8 +5754,7 @@ fn parse_create_instead_of_delete_trigger() {
         table_name: ObjectName::from(vec![Ident::new("accounts")]),
         referenced_table_name: None,
         referencing: vec![],
-        trigger_object: Some(TriggerObject::Row),
-        include_each: true,
+        trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
         condition: None,
         exec_body: Some(TriggerExecBody {
             exec_type: TriggerExecBodyType::Function,
@@ -5793,8 +5790,7 @@ fn parse_create_trigger_with_multiple_events_and_deferrable() {
         table_name: ObjectName::from(vec![Ident::new("accounts")]),
         referenced_table_name: None,
         referencing: vec![],
-        trigger_object: Some(TriggerObject::Row),
-        include_each: true,
+        trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
         condition: None,
         exec_body: Some(TriggerExecBody {
             exec_type: TriggerExecBodyType::Function,
@@ -5841,8 +5837,7 @@ fn parse_create_trigger_with_referencing() {
                 transition_relation_name: ObjectName::from(vec![Ident::new("old_accounts")]),
             },
         ],
-        trigger_object: Some(TriggerObject::Row),
-        include_each: true,
+        trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
         condition: None,
         exec_body: Some(TriggerExecBody {
             exec_type: TriggerExecBodyType::Function,
@@ -6147,8 +6142,7 @@ fn parse_trigger_related_functions() {
             table_name: ObjectName::from(vec![Ident::new("emp")]),
             referenced_table_name: None,
             referencing: vec![],
-            trigger_object: Some(TriggerObject::Row),
-            include_each: true,
+            trigger_object: Some(TriggerObjectKind::ForEach(TriggerObject::Row)),
             condition: None,
             exec_body: Some(TriggerExecBody {
                 exec_type: TriggerExecBodyType::Function,
diff --git a/tests/sqlparser_sqlite.rs b/tests/sqlparser_sqlite.rs
@@ -628,7 +628,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -646,8 +645,10 @@ fn test_create_trigger() {
             assert_eq!(table_name.to_string(), "assets");
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
-            assert_eq!(trigger_object, Some(TriggerObject::Row));
-            assert!(include_each);
+            assert_eq!(
+                trigger_object,
+                Some(TriggerObjectKind::ForEach(TriggerObject::Row))
+            );
             assert!(condition.is_none());
             assert!(!statements_as);
             assert!(characteristics.is_none());
@@ -673,7 +674,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -692,7 +692,6 @@ fn test_create_trigger() {
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
             assert!(trigger_object.is_none());
-            assert!(!include_each);
             assert!(condition.is_none());
             assert!(!statements_as);
             assert!(characteristics.is_none());
@@ -715,7 +714,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -734,7 +732,6 @@ fn test_create_trigger() {
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
             assert!(trigger_object.is_none());
-            assert!(!include_each);
             assert!(condition.is_none());
             assert!(!statements_as);
             assert!(characteristics.is_none());
@@ -757,7 +754,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -775,8 +771,10 @@ fn test_create_trigger() {
             assert_eq!(table_name.to_string(), "products");
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
-            assert_eq!(trigger_object, Some(TriggerObject::Row));
-            assert!(include_each);
+            assert_eq!(
+                trigger_object,
+                Some(TriggerObjectKind::ForEach(TriggerObject::Row))
+            );
             assert!(condition.is_some());
             assert!(!statements_as);
             assert!(characteristics.is_none());
@@ -800,7 +798,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -819,7 +816,6 @@ fn test_create_trigger() {
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
             assert!(trigger_object.is_none());
-            assert!(!include_each);
             assert!(condition.is_none());
             assert!(!statements_as);
             assert!(characteristics.is_none());
@@ -843,7 +839,6 @@ fn test_create_trigger() {
             referenced_table_name,
             referencing,
             trigger_object,
-            include_each,
             condition,
             exec_body: _,
             statements_as,
@@ -862,7 +857,6 @@ fn test_create_trigger() {
             assert!(referenced_table_name.is_none());
             assert!(referencing.is_empty());
             assert!(trigger_object.is_none());
-            assert!(!include_each);
             assert!(condition.is_none());
             assert!(!statements_as);
             assert!(characteristics.is_none());
