From f75aca67bb00124008b1081be5e6ae0ad18031e9 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:52:30 +0200
Subject: [PATCH] sqlite3-parser: separate boxed TriggerCmd struct variants

---
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 41 +++++-----
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 76 +++++++++++--------
 vendored/sqlite3-parser/src/parser/parse.y    |  6 +-
 3 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 2d44f5255..313177a39 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -1651,13 +1651,14 @@ impl ToTokens for TriggerEvent {
 impl ToTokens for TriggerCmd {
     fn to_tokens<S: TokenStream>(&self, s: &mut S) -> Result<(), S::Error> {
         match self {
-            Self::Update {
-                or_conflict,
-                tbl_name,
-                sets,
-                from,
-                where_clause,
-            } => {
+            Self::Update(update) => {
+                let TriggerCmdUpdate {
+                    or_conflict,
+                    tbl_name,
+                    sets,
+                    from,
+                    where_clause,
+                } = &**update;
                 s.append(TK_UPDATE, None)?;
                 if let Some(or_conflict) = or_conflict {
                     s.append(TK_OR, None)?;
@@ -1676,14 +1677,15 @@ impl ToTokens for TriggerCmd {
                 }
                 Ok(())
             }
-            Self::Insert {
-                or_conflict,
-                tbl_name,
-                col_names,
-                select,
-                upsert,
-                returning,
-            } => {
+            Self::Insert(insert) => {
+                let TriggerCmdInsert {
+                    or_conflict,
+                    tbl_name,
+                    col_names,
+                    select,
+                    upsert,
+                    returning,
+                } = &**insert;
                 if let Some(ResolveType::Replace) = or_conflict {
                     s.append(TK_REPLACE, None)?;
                 } else {
@@ -1710,14 +1712,11 @@ impl ToTokens for TriggerCmd {
                 }
                 Ok(())
             }
-            Self::Delete {
-                tbl_name,
-                where_clause,
-            } => {
+            Self::Delete(delete) => {
                 s.append(TK_DELETE, None)?;
                 s.append(TK_FROM, None)?;
-                tbl_name.to_tokens(s)?;
-                if let Some(where_clause) = where_clause {
+                delete.tbl_name.to_tokens(s)?;
+                if let Some(where_clause) = &delete.where_clause {
                     s.append(TK_WHERE, None)?;
                     where_clause.to_tokens(s)?;
                 }
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 3c729ea70..6b0ac88df 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -1640,44 +1640,56 @@ pub enum TriggerEvent {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum TriggerCmd {
     /// `UPDATE`
-    Update {
-        /// `OR`
-        or_conflict: Option<ResolveType>,
-        /// table name
-        tbl_name: Name,
-        /// `SET` assignments
-        sets: Vec<Set>,
-        /// `FROM`
-        from: Option<FromClause>,
-        /// `WHERE` clause
-        where_clause: Option<Expr>,
-    },
+    Update(Box<TriggerCmdUpdate>),
     /// `INSERT`
-    Insert {
-        /// `OR`
-        or_conflict: Option<ResolveType>,
-        /// table name
-        tbl_name: Name,
-        /// `COLUMNS`
-        col_names: Option<DistinctNames>,
-        /// `SELECT` or `VALUES`
-        select: Box<Select>,
-        /// `ON CONLICT` clause
-        upsert: Option<Upsert>,
-        /// `RETURNING`
-        returning: Option<Vec<ResultColumn>>,
-    },
+    Insert(Box<TriggerCmdInsert>),
     /// `DELETE`
-    Delete {
-        /// table name
-        tbl_name: Name,
-        /// `WHERE` clause
-        where_clause: Option<Expr>,
-    },
+    Delete(Box<TriggerCmdDelete>),
     /// `SELECT`
     Select(Box<Select>),
 }
 
+/// `UPDATE` trigger command
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TriggerCmdUpdate {
+    /// `OR`
+    pub or_conflict: Option<ResolveType>,
+    /// table name
+    pub tbl_name: Name,
+    /// `SET` assignments
+    pub sets: Vec<Set>,
+    /// `FROM`
+    pub from: Option<FromClause>,
+    /// `WHERE` clause
+    pub where_clause: Option<Expr>,
+}
+
+/// `INSERT` trigger command
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TriggerCmdInsert {
+    /// `OR`
+    pub or_conflict: Option<ResolveType>,
+    /// table name
+    pub tbl_name: Name,
+    /// `COLUMNS`
+    pub col_names: Option<DistinctNames>,
+    /// `SELECT` or `VALUES`
+    pub select: Box<Select>,
+    /// `ON CONLICT` clause
+    pub upsert: Option<Upsert>,
+    /// `RETURNING`
+    pub returning: Option<Vec<ResultColumn>>,
+}
+
+/// `DELETE` trigger command
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TriggerCmdDelete {
+    /// table name
+    pub tbl_name: Name,
+    /// `WHERE` clause
+    pub where_clause: Option<Expr>,
+}
+
 /// Conflict resolution types
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum ResolveType {
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 2e298aa9e..889bb4690 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1235,17 +1235,17 @@ tridxby ::= NOT INDEXED. {
 // UPDATE
 trigger_cmd(A) ::=
    UPDATE orconf(R) trnm(X) tridxby SET setlist(Y) from(F) where_opt(Z).
-   {A = TriggerCmd::Update{ or_conflict: R, tbl_name: X, sets: Y, from: F, where_clause: Z };}
+   {A = TriggerCmd::Update(Box::new(TriggerCmdUpdate{ or_conflict: R, tbl_name: X, sets: Y, from: F, where_clause: Z }));}
 
 // INSERT
 trigger_cmd(A) ::= insert_cmd(R) INTO
                       trnm(X) idlist_opt(F) select(S) upsert(U). {
   let (upsert, returning) = U;
-   A = TriggerCmd::Insert{ or_conflict: R, tbl_name: X, col_names: F, select: Box::new(S), upsert, returning };/*A-overwrites-R*/
+   A = TriggerCmd::Insert(Box::new(TriggerCmdInsert{ or_conflict: R, tbl_name: X, col_names: F, select: Box::new(S), upsert, returning }));/*A-overwrites-R*/
 }
 // DELETE
 trigger_cmd(A) ::= DELETE FROM trnm(X) tridxby where_opt(Y).
-   {A = TriggerCmd::Delete{ tbl_name: X, where_clause: Y };}
+   {A = TriggerCmd::Delete(Box::new(TriggerCmdDelete{ tbl_name: X, where_clause: Y }));}
 
 // SELECT
 trigger_cmd(A) ::= select(X).