From a5041a685c8dfe88c4f298ff02c9b7367153dfdb Mon Sep 17 00:00:00 2001 From: TcMits Date: Fri, 8 Aug 2025 14:35:43 +0700 Subject: [PATCH] replace Option> with Vec<...> --- parser/src/ast.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/parser/src/ast.rs b/parser/src/ast.rs index f4c0decbe..1f1bcb7ae 100644 --- a/parser/src/ast.rs +++ b/parser/src/ast.rs @@ -116,7 +116,7 @@ pub enum Stmt { /// view name view_name: QualifiedName, /// columns - columns: Option>, + columns: Vec, /// query select: Select, }, @@ -129,7 +129,7 @@ pub enum Stmt { /// module name module_name: Name, /// args - args: Option>, // TODO smol str + args: Vec, // TODO smol str }, /// `DELETE` Delete { @@ -142,9 +142,9 @@ pub enum Stmt { /// `WHERE` clause where_clause: Option>, /// `RETURNING` - returning: Option>, + returning: Vec, /// `ORDER BY` - order_by: Option>, + order_by: Vec, /// `LIMIT` limit: Option, }, @@ -190,11 +190,11 @@ pub enum Stmt { /// table name tbl_name: QualifiedName, /// `COLUMNS` - columns: Option>, + columns: Vec, /// `VALUES` or `SELECT` body: InsertBody, /// `RETURNING` - returning: Option>, + returning: Vec, }, /// `PRAGMA`: pragma name, body Pragma { @@ -244,9 +244,9 @@ pub enum Stmt { /// `WHERE` clause where_clause: Option>, /// `RETURNING` - returning: Option>, + returning: Vec, /// `ORDER BY` - order_by: Option>, + order_by: Vec, /// `LIMIT` limit: Option, }, @@ -771,7 +771,7 @@ pub enum CreateTableBody { /// table column definitions columns: Vec, /// table constraints - constraints: Option>, + constraints: Vec, /// table options options: TableOptions, }, @@ -940,7 +940,7 @@ pub struct ForeignKeyClause { /// foreign table name pub tbl_name: Name, /// foreign table columns - pub columns: Option>, + pub columns: Vec, /// referential action(s) / deferrable option(s) pub args: Vec, } @@ -1182,13 +1182,13 @@ pub struct TriggerCmdInsert { /// table name pub tbl_name: Name, /// `COLUMNS` - pub col_names: Option>, + pub col_names: Vec, /// `SELECT` or `VALUES` pub select: Select, /// `ON CONFLICT` clause pub upsert: Option>, /// `RETURNING` - pub returning: Option>, + pub returning: Vec, } /// `DELETE` trigger command