From d177f6195bfdeb1e7bf0c43cce6b68fbd3a60f0d Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:34:53 +0200
Subject: [PATCH 01/13] sqlite3-parser: box big members of createindex

---
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 4 ++--
 vendored/sqlite3-parser/src/parser/parse.y    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 8cf4f805d..780af728f 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -95,13 +95,13 @@ pub enum Stmt {
         /// `IF NOT EXISTS`
         if_not_exists: bool,
         /// index name
-        idx_name: QualifiedName,
+        idx_name: Box<QualifiedName>,
         /// table name
         tbl_name: Name,
         /// indexed columns or expressions
         columns: Vec<SortedColumn>,
         /// partial index
-        where_clause: Option<Expr>,
+        where_clause: Option<Box<Expr>>,
     },
     /// `CREATE TABLE`
     CreateTable {
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index bb3c80e91..38fb47fda 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1077,8 +1077,8 @@ paren_exprlist(A) ::= LP exprlist(X) RP.  {A = X;}
 //
 cmd ::= createkw uniqueflag(U) INDEX ifnotexists(NE) fullname(X)
         ON nm(Y) LP sortlist(Z) RP where_opt(W). {
-  self.ctx.stmt = Some(Stmt::CreateIndex { unique: U, if_not_exists: NE, idx_name: X,
-                                            tbl_name: Y, columns: Z, where_clause: W });
+  self.ctx.stmt = Some(Stmt::CreateIndex { unique: U, if_not_exists: NE, idx_name: Box::new(X),
+                                            tbl_name: Y, columns: Z, where_clause: W.map(Box::new) });
 }
 
 %type uniqueflag {bool}

From 358fda2ec74c6ae1b33dff8b14519b8101f99909 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:42:53 +0200
Subject: [PATCH 02/13] sqlite3-parser: box the create table body

---
 core/ext/mod.rs                               | 2 +-
 core/schema.rs                                | 2 +-
 core/translate/mod.rs                         | 2 +-
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 2 +-
 vendored/sqlite3-parser/src/parser/parse.y    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/ext/mod.rs b/core/ext/mod.rs
index 67fd78491..344b8f4a4 100644
--- a/core/ext/mod.rs
+++ b/core/ext/mod.rs
@@ -127,7 +127,7 @@ impl Database {
         let Stmt::CreateTable { body, .. } = stmt else {
             return ResultCode::Error;
         };
-        let Ok(columns) = columns_from_create_table_body(body) else {
+        let Ok(columns) = columns_from_create_table_body(*body) else {
             return ResultCode::Error;
         };
         let vtab_module = self.vtab_modules.get(name).unwrap().clone();
diff --git a/core/schema.rs b/core/schema.rs
index f4a6aee2b..aa38cd191 100644
--- a/core/schema.rs
+++ b/core/schema.rs
@@ -150,7 +150,7 @@ impl BTreeTable {
         let cmd = parser.next()?;
         match cmd {
             Some(Cmd::Stmt(Stmt::CreateTable { tbl_name, body, .. })) => {
-                create_table(tbl_name, body, root_page)
+                create_table(tbl_name, *body, root_page)
             }
             _ => todo!("Expected CREATE TABLE statement"),
         }
diff --git a/core/translate/mod.rs b/core/translate/mod.rs
index 79791866b..d9c3f7421 100644
--- a/core/translate/mod.rs
+++ b/core/translate/mod.rs
@@ -67,7 +67,7 @@ pub fn translate(
                 bail_parse_error!("TEMPORARY table not supported yet");
             }
 
-            translate_create_table(query_mode, tbl_name, body, if_not_exists, schema)?
+            translate_create_table(query_mode, tbl_name, *body, if_not_exists, schema)?
         }
         ast::Stmt::CreateTrigger { .. } => bail_parse_error!("CREATE TRIGGER not supported yet"),
         ast::Stmt::CreateView { .. } => bail_parse_error!("CREATE VIEW not supported yet"),
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 780af728f..049084bd5 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -112,7 +112,7 @@ pub enum Stmt {
         /// table name
         tbl_name: QualifiedName,
         /// table body
-        body: CreateTableBody,
+        body: Box<CreateTableBody>,
     },
     /// `CREATE TRIGGER`
     CreateTrigger {
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 38fb47fda..511c83c3b 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -109,7 +109,7 @@ cmd ::= ROLLBACK trans_opt(Y) TO savepoint_opt nm(X). {
 ///////////////////// The CREATE TABLE statement ////////////////////////////
 //
 cmd ::= createkw temp(T) TABLE ifnotexists(E) fullname(Y) create_table_args(X). {
-  self.ctx.stmt = Some(Stmt::CreateTable{ temporary: T, if_not_exists: E, tbl_name: Y, body: X });
+  self.ctx.stmt = Some(Stmt::CreateTable{ temporary: T, if_not_exists: E, tbl_name: Y, body: Box::new(X) });
 }
 createkw(A) ::= CREATE(A).
 

From 575b48474065e8c2720de5ccfec2889f73b105b0 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:50:00 +0200
Subject: [PATCH 03/13] sqlite3-parser: separate boxed CreateTrigger struct

---
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 23 ++++---
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 67 +++++++------------
 vendored/sqlite3-parser/src/parser/parse.y    |  8 +--
 3 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 34a7fa3f0..10e7c1ad9 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -211,17 +211,18 @@ impl ToTokens for Stmt {
                 tbl_name.to_tokens(s)?;
                 body.to_tokens(s)
             }
-            Self::CreateTrigger {
-                temporary,
-                if_not_exists,
-                trigger_name,
-                time,
-                event,
-                tbl_name,
-                for_each_row,
-                when_clause,
-                commands,
-            } => {
+            Self::CreateTrigger(trigger) => {
+                let CreateTrigger {
+                    temporary,
+                    if_not_exists,
+                    trigger_name,
+                    time,
+                    event,
+                    tbl_name,
+                    for_each_row,
+                    when_clause,
+                    commands,
+                } = &**trigger;
                 s.append(TK_CREATE, None)?;
                 if *temporary {
                     s.append(TK_TEMP, None)?;
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 049084bd5..814aacdb1 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -115,26 +115,7 @@ pub enum Stmt {
         body: Box<CreateTableBody>,
     },
     /// `CREATE TRIGGER`
-    CreateTrigger {
-        /// `TEMPORARY`
-        temporary: bool,
-        /// `IF NOT EXISTS`
-        if_not_exists: bool,
-        /// trigger name
-        trigger_name: QualifiedName,
-        /// `BEFORE`/`AFTER`/`INSTEAD OF`
-        time: Option<TriggerTime>,
-        /// `DELETE`/`INSERT`/`UPDATE`
-        event: Box<TriggerEvent>,
-        /// table name
-        tbl_name: QualifiedName,
-        /// `FOR EACH ROW`
-        for_each_row: bool,
-        /// `WHEN`
-        when_clause: Option<Box<Expr>>,
-        /// statements
-        commands: Vec<TriggerCmd>,
-    },
+    CreateTrigger(Box<CreateTrigger>),
     /// `CREATE VIEW`
     CreateView {
         /// `TEMPORARY`
@@ -242,30 +223,28 @@ pub enum Stmt {
     /// `SELECT`
     Select(Box<Select>),
     /// `UPDATE`
-    Update {
-        /// CTE
-        with: Option<With>,
-        /// `OR`
-        or_conflict: Option<ResolveType>,
-        /// table name
-        tbl_name: QualifiedName,
-        /// `INDEXED`
-        indexed: Option<Indexed>,
-        /// `SET` assignments
-        sets: Vec<Set>,
-        /// `FROM`
-        from: Option<FromClause>,
-        /// `WHERE` clause
-        where_clause: Option<Box<Expr>>,
-        /// `RETURNING`
-        returning: Option<Vec<ResultColumn>>,
-        /// `ORDER BY`
-        order_by: Option<Vec<SortedColumn>>,
-        /// `LIMIT`
-        limit: Option<Box<Limit>>,
-    },
-    /// `VACUUM`: database name, into expr
-    Vacuum(Option<Name>, Option<Expr>),
+/// `CREATE TRIGGER
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct CreateTrigger {
+    /// `TEMPORARY`
+    pub temporary: bool,
+    /// `IF NOT EXISTS`
+    pub if_not_exists: bool,
+    /// trigger name
+    pub trigger_name: QualifiedName,
+    /// `BEFORE`/`AFTER`/`INSTEAD OF`
+    pub time: Option<TriggerTime>,
+    /// `DELETE`/`INSERT`/`UPDATE`
+    pub event: TriggerEvent,
+    /// table name
+    pub tbl_name: QualifiedName,
+    /// `FOR EACH ROW`
+    pub for_each_row: bool,
+    /// `WHEN`
+    pub when_clause: Option<Expr>,
+    /// statements
+    pub commands: Vec<TriggerCmd>,
+}
 }
 
 /// SQL expression
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 511c83c3b..b24c9b708 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1166,10 +1166,10 @@ minus_num(A) ::= MINUS number(X).     {A = Expr::unary(UnaryOperator::Negative,
 
 cmd ::= createkw temp(T) TRIGGER ifnotexists(NOERR) fullname(B) trigger_time(C) trigger_event(D)
         ON fullname(E) foreach_clause(X) when_clause(G) BEGIN trigger_cmd_list(S) END. {
-  self.ctx.stmt = Some(Stmt::CreateTrigger{
-    temporary: T, if_not_exists: NOERR, trigger_name: B, time: C, event: Box::new(D), tbl_name: E,
-    for_each_row: X, when_clause: G.map(Box::new), commands: S
-  });
+  self.ctx.stmt = Some(Stmt::CreateTrigger(Box::new(CreateTrigger{
+    temporary: T, if_not_exists: NOERR, trigger_name: B, time: C, event: D, tbl_name: E,
+    for_each_row: X, when_clause: G, commands: S
+  })));
 }
 
 %type trigger_time {Option<TriggerTime>}

From af920a317c78b5bd42bb9adca657091eb46f30e7 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:51:08 +0200
Subject: [PATCH 04/13] sqlite3-parser: separate boxed Update struct

---
 .../sqlite3-parser/src/parser/ast/check.rs    | 28 ++++++++++++------
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 25 ++++++++--------
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 29 +++++++++++++++++++
 vendored/sqlite3-parser/src/parser/parse.y    |  8 ++---
 4 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/check.rs b/vendored/sqlite3-parser/src/parser/ast/check.rs
index ca1e8cb55..7e65d6852 100644
--- a/vendored/sqlite3-parser/src/parser/ast/check.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/check.rs
@@ -66,10 +66,13 @@ impl Stmt {
             } => column_count(returning),
             Self::Pragma(..) => ColumnCount::Dynamic,
             Self::Select(s) => s.column_count(),
-            Self::Update {
-                returning: Some(returning),
-                ..
-            } => column_count(returning),
+            Self::Update(update) => {
+                let Update { returning, .. } = &**update;
+                match returning {
+                    Some(returning) => column_count(returning),
+                    None => ColumnCount::None,
+                }
+            }
             _ => ColumnCount::None,
         }
     }
@@ -173,11 +176,18 @@ impl Stmt {
                     Err(custom_err!("0 values for {} columns", columns.len()))
                 }
             },
-            Self::Update {
-                order_by: Some(_),
-                limit: None,
-                ..
-            } => Err(custom_err!("ORDER BY without LIMIT on UPDATE")),
+            Self::Update(update) => {
+                let Update {
+                    order_by, limit, ..
+                } = &**update;
+                if let Some(_) = order_by {
+                    if limit.is_none() {
+                        return Err(custom_err!("ORDER BY without LIMIT on UPDATE"));
+                    }
+                }
+
+                Ok(())
+            }
             _ => Ok(()),
         }
     }
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 10e7c1ad9..2d44f5255 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -466,18 +466,19 @@ impl ToTokens for Stmt {
                 name.to_tokens(s)
             }
             Self::Select(select) => select.to_tokens(s),
-            Self::Update {
-                with,
-                or_conflict,
-                tbl_name,
-                indexed,
-                sets,
-                from,
-                where_clause,
-                returning,
-                order_by,
-                limit,
-            } => {
+            Self::Update(update) => {
+                let Update {
+                    with,
+                    or_conflict,
+                    tbl_name,
+                    indexed,
+                    sets,
+                    from,
+                    where_clause,
+                    returning,
+                    order_by,
+                    limit,
+                } = &**update;
                 if let Some(with) = with {
                     with.to_tokens(s)?;
                 }
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 814aacdb1..3c729ea70 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -223,6 +223,11 @@ pub enum Stmt {
     /// `SELECT`
     Select(Box<Select>),
     /// `UPDATE`
+    Update(Box<Update>),
+    /// `VACUUM`: database name, into expr
+    Vacuum(Option<Name>, Option<Expr>),
+}
+
 /// `CREATE TRIGGER
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CreateTrigger {
@@ -245,6 +250,30 @@ pub struct CreateTrigger {
     /// statements
     pub commands: Vec<TriggerCmd>,
 }
+
+/// `UPDATE` clause
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Update {
+    /// CTE
+    pub with: Option<With>,
+    /// `OR`
+    pub or_conflict: Option<ResolveType>,
+    /// table name
+    pub tbl_name: QualifiedName,
+    /// `INDEXED`
+    pub indexed: Option<Indexed>,
+    /// `SET` assignments
+    pub sets: Vec<Set>,
+    /// `FROM`
+    pub from: Option<FromClause>,
+    /// `WHERE` clause
+    pub where_clause: Option<Box<Expr>>,
+    /// `RETURNING`
+    pub returning: Option<Vec<ResultColumn>>,
+    /// `ORDER BY`
+    pub order_by: Option<Vec<SortedColumn>>,
+    /// `LIMIT`
+    pub limit: Option<Box<Limit>>,
 }
 
 /// SQL expression
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index b24c9b708..2e298aa9e 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -790,15 +790,15 @@ where_opt_ret(A) ::= WHERE expr(X) RETURNING selcollist(Y).
 cmd ::= with(C) UPDATE orconf(R) xfullname(X) indexed_opt(I) SET setlist(Y) from(F)
         where_opt_ret(W) orderby_opt(O) limit_opt(L).  {
   let (where_clause, returning) = W;
-  self.ctx.stmt = Some(Stmt::Update { with: C, or_conflict: R, tbl_name: X, indexed: I, sets: Y, from: F,
-                                      where_clause: where_clause.map(Box::new), returning, order_by: O, limit: L });
+  self.ctx.stmt = Some(Stmt::Update(Box::new(Update{ with: C, or_conflict: R, tbl_name: X, indexed: I, sets: Y, from: F,
+                                      where_clause: where_clause.map(Box::new), returning, order_by: O, limit: L })));
 }
 %else
 cmd ::= with(C) UPDATE orconf(R) xfullname(X) indexed_opt(I) SET setlist(Y) from(F)
         where_opt_ret(W). {
   let (where_clause, returning) = W;
-  self.ctx.stmt = Some(Stmt::Update { with: C, or_conflict: R, tbl_name: X, indexed: I, sets: Y, from: F,
-                                      where_clause: where_clause.map(Box::new), returning, order_by: None, limit: None });
+  self.ctx.stmt = Some(Stmt::Update(Box::new(Update{ with: C, or_conflict: R, tbl_name: X, indexed: I, sets: Y, from: F,
+                                      where_clause: where_clause.map(Box::new), returning, order_by: None, limit: None })));
 }
 %endif
 

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 05/13] 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).

From 40a8dc14cd0fd63cbd9d75823d02580caeddc3b1 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:54:30 +0200
Subject: [PATCH 06/13] sqlite3-parser: separate boxed SelectInner struct

---
 core/translate/select.rs                      | 17 +++++-----
 .../sqlite3-parser/src/parser/ast/check.rs    |  5 ++-
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 17 +++++-----
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 32 +++++++++++--------
 vendored/sqlite3-parser/src/parser/parse.y    |  8 ++---
 5 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/core/translate/select.rs b/core/translate/select.rs
index b5091af64..22168ab7a 100644
--- a/core/translate/select.rs
+++ b/core/translate/select.rs
@@ -11,8 +11,8 @@ use crate::util::normalize_ident;
 use crate::vdbe::builder::{ProgramBuilderOpts, QueryMode};
 use crate::SymbolTable;
 use crate::{schema::Schema, vdbe::builder::ProgramBuilder, Result};
-use sqlite3_parser::ast::ResultColumn;
 use sqlite3_parser::ast::{self};
+use sqlite3_parser::ast::{ResultColumn, SelectInner};
 
 pub fn translate_select(
     query_mode: QueryMode,
@@ -42,13 +42,14 @@ pub fn prepare_select_plan(
     syms: &SymbolTable,
 ) -> Result<Plan> {
     match *select.body.select {
-        ast::OneSelect::Select {
-            mut columns,
-            from,
-            where_clause,
-            group_by,
-            ..
-        } => {
+        ast::OneSelect::Select(select_inner) => {
+            let SelectInner {
+                mut columns,
+                from,
+                where_clause,
+                group_by,
+                ..
+            } = *select_inner;
             let col_count = columns.len();
             if col_count == 0 {
                 crate::bail_parse_error!("SELECT without columns is not allowed");
diff --git a/vendored/sqlite3-parser/src/parser/ast/check.rs b/vendored/sqlite3-parser/src/parser/ast/check.rs
index 7e65d6852..d885f5485 100644
--- a/vendored/sqlite3-parser/src/parser/ast/check.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/check.rs
@@ -305,7 +305,10 @@ impl OneSelect {
     /// Like `sqlite3_column_count` but more limited
     pub fn column_count(&self) -> ColumnCount {
         match self {
-            Self::Select { columns, .. } => column_count(columns),
+            Self::Select(select) => {
+                let SelectInner { columns, .. } = &**select;
+                column_count(columns)
+            }
             Self::Values(values) => {
                 assert!(!values.is_empty()); // TODO Validate
                 ColumnCount::Fixed(values[0].len())
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 313177a39..5fc10dc89 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -893,14 +893,15 @@ impl Display for CompoundOperator {
 impl ToTokens for OneSelect {
     fn to_tokens<S: TokenStream>(&self, s: &mut S) -> Result<(), S::Error> {
         match self {
-            Self::Select {
-                distinctness,
-                columns,
-                from,
-                where_clause,
-                group_by,
-                window_clause,
-            } => {
+            Self::Select(select) => {
+                let SelectInner {
+                    distinctness,
+                    columns,
+                    from,
+                    where_clause,
+                    group_by,
+                    window_clause,
+                } = &**select;
                 s.append(TK_SELECT, None)?;
                 if let Some(ref distinctness) = distinctness {
                     distinctness.to_tokens(s)?;
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 6b0ac88df..58af258bd 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -779,24 +779,28 @@ pub enum CompoundOperator {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum OneSelect {
     /// `SELECT`
-    Select {
-        /// `DISTINCT`
-        distinctness: Option<Distinctness>,
-        /// columns
-        columns: Vec<ResultColumn>,
-        /// `FROM` clause
-        from: Option<FromClause>,
-        /// `WHERE` clause
-        where_clause: Option<Expr>,
-        /// `GROUP BY`
-        group_by: Option<GroupBy>,
-        /// `WINDOW` definition
-        window_clause: Option<Vec<WindowDef>>,
-    },
+    Select(Box<SelectInner>),
     /// `VALUES`
     Values(Vec<Vec<Expr>>),
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+/// `SELECT` core
+pub struct SelectInner {
+    /// `DISTINCT`
+    pub distinctness: Option<Distinctness>,
+    /// columns
+    pub columns: Vec<ResultColumn>,
+    /// `FROM` clause
+    pub from: Option<FromClause>,
+    /// `WHERE` clause
+    pub where_clause: Option<Expr>,
+    /// `GROUP BY`
+    pub group_by: Option<GroupBy>,
+    /// `WINDOW` definition
+    pub window_clause: Option<Vec<WindowDef>>,
+}
+
 /// `SELECT` ... `FROM` clause
 // https://sqlite.org/syntax/join-clause.html
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 889bb4690..f24204d81 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -525,14 +525,14 @@ multiselect_op(A) ::= INTERSECT.         {A = CompoundOperator::Intersect;}
 
 oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y)
                  groupby_opt(P). {
-  A = OneSelect::Select{ distinctness: D, columns: W, from: X, where_clause: Y,
-                         group_by: P, window_clause: None };
+  A = OneSelect::Select(Box::new(SelectInner{ distinctness: D, columns: W, from: X, where_clause: Y,
+                         group_by: P, window_clause: None }));
     }
 %ifndef SQLITE_OMIT_WINDOWFUNC
 oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y)
                  groupby_opt(P) window_clause(R). {
-  A = OneSelect::Select{ distinctness: D, columns: W, from: X, where_clause: Y,
-                         group_by: P, window_clause: Some(R) };
+  A = OneSelect::Select(Box::new(SelectInner{ distinctness: D, columns: W, from: X, where_clause: Y,
+                         group_by: P, window_clause: Some(R) }));
 }
 %endif
 

From 32887518ce62dadc7c1022fa45ebf251ad679409 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 12:59:08 +0200
Subject: [PATCH 07/13] sqlite3-parser: separate boxed Delete struct

---
 core/translate/mod.rs                         | 13 +++----
 .../sqlite3-parser/src/parser/ast/check.rs    | 27 +++++++++-----
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 19 +++++-----
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 36 ++++++++++---------
 vendored/sqlite3-parser/src/parser/parse.y    |  8 ++---
 5 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/core/translate/mod.rs b/core/translate/mod.rs
index d9c3f7421..d279ffb3b 100644
--- a/core/translate/mod.rs
+++ b/core/translate/mod.rs
@@ -74,12 +74,13 @@ pub fn translate(
         ast::Stmt::CreateVirtualTable { .. } => {
             bail_parse_error!("CREATE VIRTUAL TABLE not supported yet")
         }
-        ast::Stmt::Delete {
-            tbl_name,
-            where_clause,
-            limit,
-            ..
-        } => {
+        ast::Stmt::Delete(delete) => {
+            let Delete {
+                tbl_name,
+                where_clause,
+                limit,
+                ..
+            } = *delete;
             change_cnt_on = true;
             translate_delete(query_mode, schema, &tbl_name, where_clause, limit, syms)?
         }
diff --git a/vendored/sqlite3-parser/src/parser/ast/check.rs b/vendored/sqlite3-parser/src/parser/ast/check.rs
index d885f5485..372135014 100644
--- a/vendored/sqlite3-parser/src/parser/ast/check.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/check.rs
@@ -56,10 +56,13 @@ impl Stmt {
     /// Like `sqlite3_column_count` but more limited
     pub fn column_count(&self) -> ColumnCount {
         match self {
-            Self::Delete {
-                returning: Some(returning),
-                ..
-            } => column_count(returning),
+            Self::Delete(delete) => {
+                let Delete { returning, .. } = &**delete;
+                match returning {
+                    Some(returning) => column_count(returning),
+                    None => ColumnCount::None,
+                }
+            }
             Self::Insert {
                 returning: Some(returning),
                 ..
@@ -156,11 +159,17 @@ impl Stmt {
                     _ => Ok(()),
                 }
             }
-            Self::Delete {
-                order_by: Some(_),
-                limit: None,
-                ..
-            } => Err(custom_err!("ORDER BY without LIMIT on DELETE")),
+            Self::Delete(delete) => {
+                let Delete {
+                    order_by, limit, ..
+                } = &**delete;
+                if let Some(_) = order_by {
+                    if limit.is_none() {
+                        return Err(custom_err!("ORDER BY without LIMIT on DELETE"));
+                    }
+                }
+                Ok(())
+            }
             Self::Insert {
                 columns: Some(columns),
                 body,
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 5fc10dc89..0088497ef 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -305,15 +305,16 @@ impl ToTokens for Stmt {
                 }
                 s.append(TK_RP, None)
             }
-            Self::Delete {
-                with,
-                tbl_name,
-                indexed,
-                where_clause,
-                returning,
-                order_by,
-                limit,
-            } => {
+            Self::Delete(delete) => {
+                let Delete {
+                    with,
+                    tbl_name,
+                    indexed,
+                    where_clause,
+                    returning,
+                    order_by,
+                    limit,
+                } = &**delete;
                 if let Some(with) = with {
                     with.to_tokens(s)?;
                 }
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 58af258bd..270876114 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -141,22 +141,7 @@ pub enum Stmt {
         args: Option<Vec<String>>, // TODO smol str
     },
     /// `DELETE`
-    Delete {
-        /// CTE
-        with: Option<With>,
-        /// `FROM` table name
-        tbl_name: QualifiedName,
-        /// `INDEXED`
-        indexed: Option<Indexed>,
-        /// `WHERE` clause
-        where_clause: Option<Box<Expr>>,
-        /// `RETURNING`
-        returning: Option<Vec<ResultColumn>>,
-        /// `ORDER BY`
-        order_by: Option<Vec<SortedColumn>>,
-        /// `LIMIT`
-        limit: Option<Box<Limit>>,
-    },
+    Delete(Box<Delete>),
     /// `DETACH DATABASE`: db name
     Detach(Expr), // TODO distinction between DETACH and DETACH DATABASE
     /// `DROP INDEX`
@@ -276,6 +261,25 @@ pub struct Update {
     pub limit: Option<Box<Limit>>,
 }
 
+/// `DELETE`
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Delete {
+    /// CTE
+    pub with: Option<With>,
+    /// `FROM` table name
+    pub tbl_name: QualifiedName,
+    /// `INDEXED`
+    pub indexed: Option<Indexed>,
+    /// `WHERE` clause
+    pub where_clause: Option<Box<Expr>>,
+    /// `RETURNING`
+    pub returning: Option<Vec<ResultColumn>>,
+    /// `ORDER BY`
+    pub order_by: Option<Vec<SortedColumn>>,
+    /// `LIMIT`
+    pub limit: Option<Box<Limit>>,
+}
+
 /// SQL expression
 // https://sqlite.org/syntax/expr.html
 #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index f24204d81..d56cd178e 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -761,14 +761,14 @@ limit_opt(A) ::= LIMIT expr(X) COMMA expr(Y).
 cmd ::= with(C) DELETE FROM xfullname(X) indexed_opt(I) where_opt_ret(W)
         orderby_opt(O) limit_opt(L). {
   let (where_clause, returning) = W;
-  self.ctx.stmt = Some(Stmt::Delete{ with: C, tbl_name: X, indexed: I, where_clause: where_clause.map(Box::new), returning,
-                                     order_by: O, limit: L });
+  self.ctx.stmt = Some(Stmt::Delete(Box::new(Delete{ with: C, tbl_name: X, indexed: I, where_clause: where_clause.map(Box::new), returning,
+                                     order_by: O, limit: L })));
 }
 %else
 cmd ::= with(C) DELETE FROM xfullname(X) indexed_opt(I) where_opt_ret(W). {
   let (where_clause, returning) = W;
-  self.ctx.stmt = Some(Stmt::Delete{ with: C, tbl_name: X, indexed: I, where_clause: where_clause.map(Box::new), returning,
-                                     order_by: None, limit: None });
+  self.ctx.stmt = Some(Stmt::Delete(Box::new(Delete{ with: C, tbl_name: X, indexed: I, where_clause: where_clause.map(Box::new), returning,
+                                     order_by: None, limit: None })));
 }
 %endif
 

From f0d7d82e1d6bed209240ce5bcefc5c445d9b8951 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 13:00:58 +0200
Subject: [PATCH 08/13] sqlite3-parser: Box the Expr in Detach

---
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 2 +-
 vendored/sqlite3-parser/src/parser/parse.y    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 270876114..39cf64f42 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -143,7 +143,7 @@ pub enum Stmt {
     /// `DELETE`
     Delete(Box<Delete>),
     /// `DETACH DATABASE`: db name
-    Detach(Expr), // TODO distinction between DETACH and DETACH DATABASE
+    Detach(Box<Expr>), // TODO distinction between DETACH and DETACH DATABASE
     /// `DROP INDEX`
     DropIndex {
         /// `IF EXISTS`
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index d56cd178e..db1de8b79 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1279,7 +1279,7 @@ cmd ::= ATTACH database_kw_opt expr(F) AS expr(D) key_opt(K). {
   self.ctx.stmt = Some(Stmt::Attach{ expr: Box::new(F), db_name: Box::new(D), key: K.map(Box::new) });
 }
 cmd ::= DETACH database_kw_opt expr(D). {
-  self.ctx.stmt = Some(Stmt::Detach(D));
+  self.ctx.stmt = Some(Stmt::Detach(Box::new(D)));
 }
 
 %type key_opt {Option<Expr>}

From 23c4106433559b81e1dbc34850b2465ad49fa375 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 13:09:40 +0200
Subject: [PATCH 09/13] sqlite3-parser: separate boxed Insert struct

---
 core/translate/mod.rs                         | 18 ++++----
 .../sqlite3-parser/src/parser/ast/check.rs    | 42 +++++++++++--------
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 17 ++++----
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 32 +++++++-------
 vendored/sqlite3-parser/src/parser/parse.y    |  8 ++--
 5 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/core/translate/mod.rs b/core/translate/mod.rs
index d279ffb3b..777d7573d 100644
--- a/core/translate/mod.rs
+++ b/core/translate/mod.rs
@@ -34,6 +34,7 @@ use crate::{bail_parse_error, Connection, LimboError, Result, SymbolTable};
 use insert::translate_insert;
 use select::translate_select;
 use sqlite3_parser::ast::{self, fmt::ToTokens};
+use sqlite3_parser::ast::{Delete, Insert};
 use std::cell::RefCell;
 use std::fmt::Display;
 use std::rc::{Rc, Weak};
@@ -104,14 +105,15 @@ pub fn translate(
         ast::Stmt::Select(select) => translate_select(query_mode, schema, *select, syms)?,
         ast::Stmt::Update { .. } => bail_parse_error!("UPDATE not supported yet"),
         ast::Stmt::Vacuum(_, _) => bail_parse_error!("VACUUM not supported yet"),
-        ast::Stmt::Insert {
-            with,
-            or_conflict,
-            tbl_name,
-            columns,
-            body,
-            returning,
-        } => {
+        ast::Stmt::Insert(insert) => {
+            let Insert {
+                with,
+                or_conflict,
+                tbl_name,
+                columns,
+                body,
+                returning,
+            } = *insert;
             change_cnt_on = true;
             translate_insert(
                 query_mode,
diff --git a/vendored/sqlite3-parser/src/parser/ast/check.rs b/vendored/sqlite3-parser/src/parser/ast/check.rs
index 372135014..be830afb9 100644
--- a/vendored/sqlite3-parser/src/parser/ast/check.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/check.rs
@@ -63,10 +63,13 @@ impl Stmt {
                     None => ColumnCount::None,
                 }
             }
-            Self::Insert {
-                returning: Some(returning),
-                ..
-            } => column_count(returning),
+            Self::Insert(insert) => {
+                let Insert { returning, .. } = &**insert;
+                match returning {
+                    Some(returning) => column_count(returning),
+                    None => ColumnCount::None,
+                }
+            }
             Self::Pragma(..) => ColumnCount::Dynamic,
             Self::Select(s) => s.column_count(),
             Self::Update(update) => {
@@ -170,21 +173,24 @@ impl Stmt {
                 }
                 Ok(())
             }
-            Self::Insert {
-                columns: Some(columns),
-                body,
-                ..
-            } => match &**body {
-                InsertBody::Select(select, ..) => match select.body.select.column_count() {
-                    ColumnCount::Fixed(n) if n != columns.len() => {
-                        Err(custom_err!("{} values for {} columns", n, columns.len()))
-                    }
-                    _ => Ok(()),
-                },
-                InsertBody::DefaultValues => {
-                    Err(custom_err!("0 values for {} columns", columns.len()))
+            Self::Insert(insert) => {
+                let Insert { columns, body, .. } = &**insert;
+                if columns.is_none() {
+                    return Ok(());
                 }
-            },
+                let columns = columns.as_ref().unwrap();
+                match &*body {
+                    InsertBody::Select(select, ..) => match select.body.select.column_count() {
+                        ColumnCount::Fixed(n) if n != columns.len() => {
+                            Err(custom_err!("{} values for {} columns", n, columns.len()))
+                        }
+                        _ => Ok(()),
+                    },
+                    InsertBody::DefaultValues => {
+                        Err(custom_err!("0 values for {} columns", columns.len()))
+                    }
+                }
+            }
             Self::Update(update) => {
                 let Update {
                     order_by, limit, ..
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index 0088497ef..e3f83e2c3 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -394,14 +394,15 @@ impl ToTokens for Stmt {
                 }
                 view_name.to_tokens(s)
             }
-            Self::Insert {
-                with,
-                or_conflict,
-                tbl_name,
-                columns,
-                body,
-                returning,
-            } => {
+            Self::Insert(insert) => {
+                let Insert {
+                    with,
+                    or_conflict,
+                    tbl_name,
+                    columns,
+                    body,
+                    returning,
+                } = &**insert;
                 if let Some(with) = with {
                     with.to_tokens(s)?;
                 }
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 39cf64f42..8e22e74e3 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -173,20 +173,7 @@ pub enum Stmt {
         view_name: QualifiedName,
     },
     /// `INSERT`
-    Insert {
-        /// CTE
-        with: Option<With>,
-        /// `OR`
-        or_conflict: Option<ResolveType>, // TODO distinction between REPLACE and INSERT OR REPLACE
-        /// table name
-        tbl_name: QualifiedName,
-        /// `COLUMNS`
-        columns: Option<DistinctNames>,
-        /// `VALUES` or `SELECT`
-        body: Box<InsertBody>,
-        /// `RETURNING`
-        returning: Option<Vec<ResultColumn>>,
-    },
+    Insert(Box<Insert>),
     /// `PRAGMA`: pragma name, body
     Pragma(QualifiedName, Option<PragmaBody>),
     /// `REINDEX`
@@ -236,6 +223,23 @@ pub struct CreateTrigger {
     pub commands: Vec<TriggerCmd>,
 }
 
+/// `INSERT`
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Insert {
+    /// CTE
+    pub with: Option<With>,
+    /// `OR`
+    pub or_conflict: Option<ResolveType>, // TODO distinction between REPLACE and INSERT OR REPLACE
+    /// table name
+    pub tbl_name: QualifiedName,
+    /// `COLUMNS`
+    pub columns: Option<DistinctNames>,
+    /// `VALUES` or `SELECT`
+    pub body: InsertBody,
+    /// `RETURNING`
+    pub returning: Option<Vec<ResultColumn>>,
+}
+
 /// `UPDATE` clause
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Update {
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index db1de8b79..dc92b9198 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -827,14 +827,14 @@ cmd ::= with(W) insert_cmd(R) INTO xfullname(X) idlist_opt(F) select(S)
         upsert(U). {
   let (upsert, returning) = U;
   let body = InsertBody::Select(Box::new(S), upsert);
-  self.ctx.stmt = Some(Stmt::Insert{ with: W, or_conflict: R, tbl_name: X, columns: F,
-                                     body: Box::new(body), returning });
+  self.ctx.stmt = Some(Stmt::Insert(Box::new(Insert{ with: W, or_conflict: R, tbl_name: X, columns: F,
+                                     body, returning })));
 }
 cmd ::= with(W) insert_cmd(R) INTO xfullname(X) idlist_opt(F) DEFAULT VALUES returning(Y).
 {
   let body = InsertBody::DefaultValues;
-  self.ctx.stmt = Some(Stmt::Insert{ with: W, or_conflict: R, tbl_name: X, columns: F,
-                                     body: Box::new(body), returning: Y });
+  self.ctx.stmt = Some(Stmt::Insert(Box::new(Insert{ with: W, or_conflict: R, tbl_name: X, columns: F,
+                                     body, returning: Y })));
 }
 
 %type upsert {(Option<Upsert>, Option<Vec<ResultColumn>>)}

From 72a055e5fe00d8554ff7684260ce7665f4212565 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 13:10:52 +0200
Subject: [PATCH 10/13] sqlite3-parser: box Pragma

---
 core/translate/mod.rs                         |  2 +-
 vendored/sqlite3-parser/src/parser/ast/mod.rs |  2 +-
 vendored/sqlite3-parser/src/parser/parse.y    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/translate/mod.rs b/core/translate/mod.rs
index 777d7573d..33504d369 100644
--- a/core/translate/mod.rs
+++ b/core/translate/mod.rs
@@ -94,7 +94,7 @@ pub fn translate(
             query_mode,
             &schema,
             &name,
-            body,
+            body.map(|b| *b),
             database_header.clone(),
             pager,
         )?,
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 8e22e74e3..19e506e8a 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -175,7 +175,7 @@ pub enum Stmt {
     /// `INSERT`
     Insert(Box<Insert>),
     /// `PRAGMA`: pragma name, body
-    Pragma(QualifiedName, Option<PragmaBody>),
+    Pragma(Box<QualifiedName>, Option<Box<PragmaBody>>),
     /// `REINDEX`
     Reindex {
         /// collation or index or table name
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index dc92b9198..e939a724d 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1139,13 +1139,13 @@ vinto(A) ::= .                          {A = None;}
 ///////////////////////////// The PRAGMA command /////////////////////////////
 //
 %ifndef SQLITE_OMIT_PRAGMA
-cmd ::= PRAGMA fullname(X).                {self.ctx.stmt = Some(Stmt::Pragma(X, None));}
-cmd ::= PRAGMA fullname(X) EQ nmnum(Y).    {self.ctx.stmt = Some(Stmt::Pragma(X, Some(PragmaBody::Equals(Y))));}
-cmd ::= PRAGMA fullname(X) LP nmnum(Y) RP. {self.ctx.stmt = Some(Stmt::Pragma(X, Some(PragmaBody::Call(Y))));}
+cmd ::= PRAGMA fullname(X).                {self.ctx.stmt = Some(Stmt::Pragma(Box::new(X), None));}
+cmd ::= PRAGMA fullname(X) EQ nmnum(Y).    {self.ctx.stmt = Some(Stmt::Pragma(Box::new(X), Some(Box::new(PragmaBody::Equals(Y)))));}
+cmd ::= PRAGMA fullname(X) LP nmnum(Y) RP. {self.ctx.stmt = Some(Stmt::Pragma(Box::new(X), Some(Box::new(PragmaBody::Call(Y)))));}
 cmd ::= PRAGMA fullname(X) EQ minus_num(Y).
-                                             {self.ctx.stmt = Some(Stmt::Pragma(X, Some(PragmaBody::Equals(Y))));}
+                                             {self.ctx.stmt = Some(Stmt::Pragma(Box::new(X), Some(Box::new(PragmaBody::Equals(Y)))));}
 cmd ::= PRAGMA fullname(X) LP minus_num(Y) RP.
-                                             {self.ctx.stmt = Some(Stmt::Pragma(X, Some(PragmaBody::Call(Y))));}
+                                             {self.ctx.stmt = Some(Stmt::Pragma(Box::new(X), Some(Box::new(PragmaBody::Call(Y)))));}
 
 %type nmnum {Expr}
 nmnum(A) ::= plus_num(A).

From 36a3cb1d5e58884cf2696a8686bf78785fc88bc1 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 14:10:18 +0200
Subject: [PATCH 11/13] sqlite3-parser: box AlterTable

---
 core/translate/mod.rs                         |  2 +-
 .../sqlite3-parser/src/parser/ast/check.rs    | 36 +++++++++++--------
 vendored/sqlite3-parser/src/parser/ast/fmt.rs |  3 +-
 vendored/sqlite3-parser/src/parser/ast/mod.rs |  2 +-
 vendored/sqlite3-parser/src/parser/parse.y    |  8 ++---
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/core/translate/mod.rs b/core/translate/mod.rs
index 33504d369..7ff780e2b 100644
--- a/core/translate/mod.rs
+++ b/core/translate/mod.rs
@@ -52,7 +52,7 @@ pub fn translate(
     let mut change_cnt_on = false;
 
     let program = match stmt {
-        ast::Stmt::AlterTable(_, _) => bail_parse_error!("ALTER TABLE not supported yet"),
+        ast::Stmt::AlterTable(_) => bail_parse_error!("ALTER TABLE not supported yet"),
         ast::Stmt::Analyze(_) => bail_parse_error!("ANALYZE not supported yet"),
         ast::Stmt::Attach { .. } => bail_parse_error!("ATTACH not supported yet"),
         ast::Stmt::Begin(_, _) => bail_parse_error!("BEGIN not supported yet"),
diff --git a/vendored/sqlite3-parser/src/parser/ast/check.rs b/vendored/sqlite3-parser/src/parser/ast/check.rs
index be830afb9..3df2c1c97 100644
--- a/vendored/sqlite3-parser/src/parser/ast/check.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/check.rs
@@ -103,22 +103,28 @@ impl Stmt {
     /// check for extra rules
     pub fn check(&self) -> Result<(), ParserError> {
         match self {
-            Self::AlterTable(old_name, AlterTableBody::RenameTo(new_name)) => {
-                if *new_name == old_name.name {
-                    return Err(custom_err!(
-                        "there is already another table or index with this name: {}",
-                        new_name
-                    ));
-                }
-                Ok(())
-            }
-            Self::AlterTable(.., AlterTableBody::AddColumn(cd)) => {
-                for c in cd {
-                    if let ColumnConstraint::PrimaryKey { .. } = c {
-                        return Err(custom_err!("Cannot add a PRIMARY KEY column"));
-                    } else if let ColumnConstraint::Unique(..) = c {
-                        return Err(custom_err!("Cannot add a UNIQUE column"));
+            Self::AlterTable(alter_table) => {
+                let (old_name, body) = &**alter_table;
+                match body {
+                    AlterTableBody::RenameTo(new_name) => {
+                        if *new_name == old_name.name {
+                            return Err(custom_err!(
+                                "there is already another table or index with this name: {}",
+                                new_name
+                            ));
+                        }
                     }
+                    AlterTableBody::AddColumn(cd) => {
+                        for c in cd {
+                            if let ColumnConstraint::PrimaryKey { .. } = c {
+                                return Err(custom_err!("Cannot add a PRIMARY KEY column"));
+                            }
+                            if let ColumnConstraint::Unique(..) = c {
+                                return Err(custom_err!("Cannot add a UNIQUE column"));
+                            }
+                        }
+                    }
+                    _ => {}
                 }
                 Ok(())
             }
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index e3f83e2c3..e6959b94e 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -119,7 +119,8 @@ impl Display for Cmd {
 impl ToTokens for Stmt {
     fn to_tokens<S: TokenStream>(&self, s: &mut S) -> Result<(), S::Error> {
         match self {
-            Self::AlterTable(tbl_name, body) => {
+            Self::AlterTable(alter_table) => {
+                let (tbl_name, body) = &**alter_table;
                 s.append(TK_ALTER, None)?;
                 s.append(TK_TABLE, None)?;
                 tbl_name.to_tokens(s)?;
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 19e506e8a..6d093c4dd 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -71,7 +71,7 @@ pub(crate) enum ExplainKind {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Stmt {
     /// `ALTER TABLE`: table name, body
-    AlterTable(QualifiedName, AlterTableBody),
+    AlterTable(Box<(QualifiedName, AlterTableBody)>),
     /// `ANALYSE`: object name
     Analyze(Option<QualifiedName>),
     /// `ATTACH DATABASE`
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index e939a724d..16c8b9f00 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1305,19 +1305,19 @@ cmd ::= ANALYZE fullname(X).  {self.ctx.stmt = Some(Stmt::Analyze(Some(X)));}
 //////////////////////// ALTER TABLE table ... ////////////////////////////////
 %ifndef SQLITE_OMIT_ALTERTABLE
 cmd ::= ALTER TABLE fullname(X) RENAME TO nm(Z). {
-  self.ctx.stmt = Some(Stmt::AlterTable(X, AlterTableBody::RenameTo(Z)));
+  self.ctx.stmt = Some(Stmt::AlterTable(Box::new((X, AlterTableBody::RenameTo(Z)))));
 }
 cmd ::= ALTER TABLE fullname(X)
         ADD kwcolumn_opt columnname(Y) carglist(C). {
   let (col_name, col_type) = Y;
   let cd = ColumnDefinition{ col_name, col_type, constraints: C };
-  self.ctx.stmt = Some(Stmt::AlterTable(X, AlterTableBody::AddColumn(cd)));
+  self.ctx.stmt = Some(Stmt::AlterTable(Box::new((X, AlterTableBody::AddColumn(cd)))));
 }
 cmd ::= ALTER TABLE fullname(X) RENAME kwcolumn_opt nm(Y) TO nm(Z). {
-  self.ctx.stmt = Some(Stmt::AlterTable(X, AlterTableBody::RenameColumn{ old: Y, new: Z }));
+  self.ctx.stmt = Some(Stmt::AlterTable(Box::new((X, AlterTableBody::RenameColumn{ old: Y, new: Z }))));
 }
 cmd ::= ALTER TABLE fullname(X) DROP kwcolumn_opt nm(Y). {
-  self.ctx.stmt = Some(Stmt::AlterTable(X, AlterTableBody::DropColumn(Y)));
+  self.ctx.stmt = Some(Stmt::AlterTable(Box::new((X, AlterTableBody::DropColumn(Y)))));
 }
 
 kwcolumn_opt ::= .

From 9b0997a60dd567c284186ef8be22db95989e8cff Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 14:11:00 +0200
Subject: [PATCH 12/13] sqlite3-parser: separate boxed CreateVirtualTable
 struct

---
 vendored/sqlite3-parser/src/lexer/sql/test.rs | 18 ++++-----------
 vendored/sqlite3-parser/src/parser/ast/fmt.rs | 13 ++++++-----
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 23 ++++++++++---------
 vendored/sqlite3-parser/src/parser/parse.y    |  6 ++---
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/vendored/sqlite3-parser/src/lexer/sql/test.rs b/vendored/sqlite3-parser/src/lexer/sql/test.rs
index 2ba066bdd..c0923403b 100644
--- a/vendored/sqlite3-parser/src/lexer/sql/test.rs
+++ b/vendored/sqlite3-parser/src/lexer/sql/test.rs
@@ -3,7 +3,7 @@ use fallible_iterator::FallibleIterator;
 use super::{Error, Parser};
 use crate::parser::ast::fmt::ToTokens;
 use crate::parser::{
-    ast::{Cmd, Name, ParameterInfo, QualifiedName, Stmt},
+    ast::{Cmd, ParameterInfo, Stmt},
     ParserError,
 };
 
@@ -73,20 +73,12 @@ fn vtab_args() -> Result<(), Error> {
   body TEXT CHECK(length(body)<10240)
 );";
     let r = parse_cmd(sql);
-    let Cmd::Stmt(Stmt::CreateVirtualTable {
-        tbl_name: QualifiedName {
-            name: Name(tbl_name),
-            ..
-        },
-        module_name: Name(module_name),
-        args: Some(args),
-        ..
-    }) = r
-    else {
+    let Cmd::Stmt(Stmt::CreateVirtualTable(create_virtual_table)) = r else {
         panic!("unexpected AST")
     };
-    assert_eq!(tbl_name, "mail");
-    assert_eq!(module_name, "fts3");
+    assert_eq!(create_virtual_table.tbl_name.name, "mail");
+    assert_eq!(create_virtual_table.module_name.0, "fts3");
+    let args = create_virtual_table.args.as_ref().unwrap();
     assert_eq!(args.len(), 2);
     assert_eq!(args[0], "subject VARCHAR(256) NOT NULL");
     assert_eq!(args[1], "body TEXT CHECK(length(body)<10240)");
diff --git a/vendored/sqlite3-parser/src/parser/ast/fmt.rs b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
index e6959b94e..3c264d607 100644
--- a/vendored/sqlite3-parser/src/parser/ast/fmt.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/fmt.rs
@@ -283,12 +283,13 @@ impl ToTokens for Stmt {
                 s.append(TK_AS, None)?;
                 select.to_tokens(s)
             }
-            Self::CreateVirtualTable {
-                if_not_exists,
-                tbl_name,
-                module_name,
-                args,
-            } => {
+            Self::CreateVirtualTable(create_virtual_table) => {
+                let CreateVirtualTable {
+                    if_not_exists,
+                    tbl_name,
+                    module_name,
+                    args,
+                } = &**create_virtual_table;
                 s.append(TK_CREATE, None)?;
                 s.append(TK_VIRTUAL, None)?;
                 s.append(TK_TABLE, None)?;
diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index 6d093c4dd..f942d1090 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -130,16 +130,7 @@ pub enum Stmt {
         select: Box<Select>,
     },
     /// `CREATE VIRTUAL TABLE`
-    CreateVirtualTable {
-        /// `IF NOT EXISTS`
-        if_not_exists: bool,
-        /// table name
-        tbl_name: QualifiedName,
-        /// module
-        module_name: Name,
-        /// args
-        args: Option<Vec<String>>, // TODO smol str
-    },
+    CreateVirtualTable(Box<CreateVirtualTable>),
     /// `DELETE`
     Delete(Box<Delete>),
     /// `DETACH DATABASE`: db name
@@ -197,7 +188,17 @@ pub enum Stmt {
     /// `UPDATE`
     Update(Box<Update>),
     /// `VACUUM`: database name, into expr
-    Vacuum(Option<Name>, Option<Expr>),
+/// `CREATE VIRTUAL TABLE`
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct CreateVirtualTable {
+    /// `IF NOT EXISTS`
+    pub if_not_exists: bool,
+    /// table name
+    pub tbl_name: QualifiedName,
+    /// module name
+    pub module_name: Name,
+    /// args
+    pub args: Option<Vec<String>>, // TODO smol str
 }
 
 /// `CREATE TRIGGER
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 16c8b9f00..6ff139835 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1329,15 +1329,15 @@ kwcolumn_opt ::= COLUMNKW.
 cmd ::= create_vtab(X).                       {self.ctx.stmt = Some(X);}
 cmd ::= create_vtab(X) LP vtabarglist RP.  {
   let mut stmt = X;
-  if let Stmt::CreateVirtualTable{ ref mut args, .. } = stmt {
-    *args = self.ctx.module_args();
+  if let Stmt::CreateVirtualTable(ref mut create_virtual_table) = stmt {
+    create_virtual_table.args = self.ctx.module_args();
   }
   self.ctx.stmt = Some(stmt);
 }
 %type create_vtab {Stmt}
 create_vtab(A) ::= createkw VIRTUAL TABLE ifnotexists(E)
                 fullname(X) USING nm(Z). {
-    A = Stmt::CreateVirtualTable{ if_not_exists: E, tbl_name: X, module_name: Z, args: None };
+    A = Stmt::CreateVirtualTable(Box::new(CreateVirtualTable{ if_not_exists: E, tbl_name: X, module_name: Z, args: None }));
 }
 vtabarglist ::= vtabarg.
 vtabarglist ::= vtabarglist COMMA vtabarg.

From a8685c80862f994f20965f825864474076b56898 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Sun, 9 Feb 2025 14:11:57 +0200
Subject: [PATCH 13/13] sqlite3-parser: box the Expr in Vacuum

---
 vendored/sqlite3-parser/src/parser/ast/mod.rs | 3 +++
 vendored/sqlite3-parser/src/parser/parse.y    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vendored/sqlite3-parser/src/parser/ast/mod.rs b/vendored/sqlite3-parser/src/parser/ast/mod.rs
index f942d1090..3ea9d5992 100644
--- a/vendored/sqlite3-parser/src/parser/ast/mod.rs
+++ b/vendored/sqlite3-parser/src/parser/ast/mod.rs
@@ -188,6 +188,9 @@ pub enum Stmt {
     /// `UPDATE`
     Update(Box<Update>),
     /// `VACUUM`: database name, into expr
+    Vacuum(Option<Name>, Option<Box<Expr>>),
+}
+
 /// `CREATE VIRTUAL TABLE`
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CreateVirtualTable {
diff --git a/vendored/sqlite3-parser/src/parser/parse.y b/vendored/sqlite3-parser/src/parser/parse.y
index 6ff139835..aeb6c689f 100644
--- a/vendored/sqlite3-parser/src/parser/parse.y
+++ b/vendored/sqlite3-parser/src/parser/parse.y
@@ -1130,8 +1130,8 @@ cmd ::= DROP INDEX ifexists(E) fullname(X).   {self.ctx.stmt = Some(Stmt::DropIn
 //
 %if !SQLITE_OMIT_VACUUM && !SQLITE_OMIT_ATTACH
 %type vinto {Option<Expr>}
-cmd ::= VACUUM vinto(Y).                {self.ctx.stmt = Some(Stmt::Vacuum(None, Y));}
-cmd ::= VACUUM nm(X) vinto(Y).          {self.ctx.stmt = Some(Stmt::Vacuum(Some(X), Y));}
+cmd ::= VACUUM vinto(Y).                {self.ctx.stmt = Some(Stmt::Vacuum(None, Y.map(Box::new)));}
+cmd ::= VACUUM nm(X) vinto(Y).          {self.ctx.stmt = Some(Stmt::Vacuum(Some(X), Y.map(Box::new)));}
 vinto(A) ::= INTO expr(X).              {A = Some(X);}
 vinto(A) ::= .                          {A = None;}
 %endif