Multi-dialect SQL parser fixes for corpus test improvements

.github/workflows/test.yml

@@ -25,3 +25,5 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Run tests
         run: cargo nextest run --all-features
+        env:
+          RUST_MIN_STACK: 8388608

src/ast/data_type.rs

@@ -307,6 +307,10 @@ pub enum DataType {
     /// [hive]: https://docs.cloudera.com/cdw-runtime/cloud/impala-sql-reference/topics/impala-struct.html
     /// [bigquery]: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#struct_type
     Struct(Vec<StructField>),
+    /// TABLE type used in BigQuery for table-valued function return types.
+    ///
+    /// [bigquery]: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#create_table_function
+    Table(Vec<StructField>),
     /// MAP<>
     DatabricksMap(Vec<StructField>),
     /// Nullable - special marker NULL represents in ClickHouse as a data type.
@@ -536,6 +540,13 @@ impl fmt::Display for DataType {
                     write!(f, "STRUCT")
                 }
             }
+            DataType::Table(fields) => {
+                if !fields.is_empty() {
+                    write!(f, "TABLE<{}>", display_comma_separated(fields))
+                } else {
+                    write!(f, "TABLE")
+                }
+            }
             DataType::DatabricksMap(fields) => {
                 if !fields.is_empty() {
                     write!(f, "MAP<{}>", display_comma_separated(fields))

src/ast/dcl.rs

@@ -26,6 +26,58 @@ use sqlparser_derive::{Visit, VisitMut};
 use super::{Expr, Ident, Password};
 use crate::ast::{display_separated, ObjectName};
 
+/// The type prefix for a grantee in GRANT/REVOKE statements.
+///
+/// Examples:
+/// - `GRANT ... TO GROUP qa_users`
+/// - `GRANT ... TO ROLE admin`
+/// - `REVOKE ... FROM APPLICATION app`
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub enum GranteesType {
+    Role,
+    User,
+    Share,
+    Group,
+    Application,
+}
+
+impl fmt::Display for GranteesType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            GranteesType::Role => write!(f, "ROLE"),
+            GranteesType::User => write!(f, "USER"),
+            GranteesType::Share => write!(f, "SHARE"),
+            GranteesType::Group => write!(f, "GROUP"),
+            GranteesType::Application => write!(f, "APPLICATION"),
+        }
+    }
+}
+
+/// A grantee in a GRANT/REVOKE statement, optionally prefixed with a type keyword.
+///
+/// Examples:
+/// - `qa_users` (no type)
+/// - `GROUP qa_users`
+/// - `ROLE admin`
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub struct Grantee {
+    pub grantee_type: Option<GranteesType>,
+    pub name: Ident,
+}
+
+impl fmt::Display for Grantee {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        if let Some(ref grantee_type) = self.grantee_type {
+            write!(f, "{} ", grantee_type)?;
+        }
+        write!(f, "{}", self.name)
+    }
+}
+
 /// An option in `ROLE` statement.
 ///
 /// <https://www.postgresql.org/docs/current/sql-createrole.html>

src/ast/ddl.rs

@@ -74,6 +74,10 @@ pub enum AlterTableOperation {
         // See `AttachPartition` for more details
         partition: Partition,
     },
+    /// `DROP PART|PARTITION <partition_expr>`
+    /// Note: this is a ClickHouse-specific operation, please refer to
+    /// [ClickHouse](https://clickhouse.com/docs/en/sql-reference/statements/alter/partition#drop-partitionpart)
+    DropPartition { partition: Partition },
     /// `DROP PRIMARY KEY`
     ///
     /// Note: this is a MySQL-specific operation.
@@ -120,10 +124,40 @@ pub enum AlterTableOperation {
     /// Note: this is Snowflake specific <https://docs.snowflake.com/en/sql-reference/sql/alter-table>
     SwapWith { table_name: ObjectName },
 
-    /// `SET OPTIONS(table_set_options_list)`
+    /// `SET OPTIONS(table_set_options_list)` (BigQuery)
+    /// or `SET (key = value, ...)` (PostgreSQL storage parameters)
+    ///
+    /// Note: BigQuery uses `SET OPTIONS(...)`, PostgreSQL uses `SET (...)`
+    SetOptions {
+        options: Vec<SqlOption>,
+        /// Whether the `OPTIONS` keyword is used (BigQuery style)
+        has_options_keyword: bool,
+    },
+
+    /// `ADD ROW ACCESS POLICY <policy_name> ON (<col_name>, ...)`
+    ///
+    /// Note: this is Snowflake specific <https://docs.snowflake.com/en/sql-reference/sql/alter-table>
+    AddRowAccessPolicy { policy: ObjectName, on: Vec<Ident> },
+
+    /// `DROP ROW ACCESS POLICY <policy_name>`
+    ///
+    /// Note: this is Snowflake specific <https://docs.snowflake.com/en/sql-reference/sql/alter-table>
+    DropRowAccessPolicy { policy: ObjectName },
+
+    /// `ADD PROJECTION [IF NOT EXISTS] <name> (<select> [ORDER BY ...]) [WITH SETTINGS (...)]`
+    ///
+    /// Note: this is a ClickHouse-specific operation
+    /// <https://clickhouse.com/docs/sql-reference/statements/alter/projection>
+    AddProjection {
+        if_not_exists: bool,
+        projection: TableProjection,
+    },
+
+    /// `DROP PROJECTION [IF EXISTS] <name>`
     ///
-    /// Note: this is BigQuery specific <https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#alter_table_set_options_statement>
-    SetOptions { options: Vec<SqlOption> },
+    /// Note: this is a ClickHouse-specific operation
+    /// <https://clickhouse.com/docs/sql-reference/statements/alter/projection>
+    DropProjection { if_exists: bool, name: Ident },
 }
 
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
@@ -187,6 +221,9 @@ impl fmt::Display for AlterTableOperation {
                     if *cascade { " CASCADE" } else { "" },
                 )
             }
+            AlterTableOperation::DropPartition { partition } => {
+                write!(f, "DROP {partition}")
+            }
             AlterTableOperation::DropPrimaryKey => write!(f, "DROP PRIMARY KEY"),
             AlterTableOperation::DropColumn {
                 column_name,
@@ -240,8 +277,42 @@ impl fmt::Display for AlterTableOperation {
             AlterTableOperation::SwapWith { table_name } => {
                 write!(f, "SWAP WITH {table_name}")
             }
-            AlterTableOperation::SetOptions { options } => {
-                write!(f, "SET OPTIONS({})", display_comma_separated(options))
+            AlterTableOperation::SetOptions {
+                options,
+                has_options_keyword,
+            } => {
+                if *has_options_keyword {
+                    write!(f, "SET OPTIONS({})", display_comma_separated(options))
+                } else {
+                    write!(f, "SET ({})", display_comma_separated(options))
+                }
+            }
+            AlterTableOperation::AddRowAccessPolicy { policy, on } => {
+                write!(
+                    f,
+                    "ADD ROW ACCESS POLICY {policy} ON ({})",
+                    display_comma_separated(on)
+                )
+            }
+            AlterTableOperation::DropRowAccessPolicy { policy } => {
+                write!(f, "DROP ROW ACCESS POLICY {policy}")
+            }
+            AlterTableOperation::AddProjection {
+                if_not_exists,
+                projection,
+            } => {
+                write!(f, "ADD")?;
+                if *if_not_exists {
+                    write!(f, " IF NOT EXISTS")?;
+                }
+                write!(f, " {projection}")
+            }
+            AlterTableOperation::DropProjection { if_exists, name } => {
+                write!(f, "DROP PROJECTION")?;
+                if *if_exists {
+                    write!(f, " IF EXISTS")?;
+                }
+                write!(f, " {name}")
             }
         }
     }
@@ -1030,6 +1101,8 @@ pub struct TableProjection {
     pub name: WithSpan<Ident>,
     pub select: Select,
     pub order_by: Option<OrderBy>,
+    /// ClickHouse: `WITH SETTINGS (key = value, ...)`
+    pub settings: Vec<SqlOption>,
 }
 
 impl fmt::Display for TableProjection {
@@ -1047,6 +1120,13 @@ impl fmt::Display for TableProjection {
             }
         }
         write!(f, ")")?;
+        if !self.settings.is_empty() {
+            write!(
+                f,
+                " WITH SETTINGS ({})",
+                display_comma_separated(&self.settings)
+            )?;
+        }
         Ok(())
     }
 }

src/ast/helpers/stmt_create_table.rs

@@ -86,6 +86,7 @@ pub struct CreateTableBuilder {
     pub table_ttl: Option<Expr>,
     pub clickhouse_settings: Option<Vec<SqlOption>>,
     pub using: Option<ObjectName>,
+    pub using_template: Option<Box<Expr>>,
     pub copy_grants: bool,
 }
 
@@ -131,6 +132,7 @@ impl CreateTableBuilder {
             table_ttl: None,
             clickhouse_settings: None,
             using: None,
+            using_template: None,
             copy_grants: false,
         }
     }
@@ -322,6 +324,11 @@ impl CreateTableBuilder {
         self
     }
 
+    pub fn using_template(mut self, using_template: Option<Box<Expr>>) -> Self {
+        self.using_template = using_template;
+        self
+    }
+
     pub fn copy_grants(mut self, copy_grants: bool) -> Self {
         self.copy_grants = copy_grants;
         self
@@ -368,6 +375,7 @@ impl CreateTableBuilder {
             table_ttl: self.table_ttl,
             clickhouse_settings: self.clickhouse_settings,
             using: self.using,
+            using_template: self.using_template,
             copy_grants: self.copy_grants,
         }
     }
@@ -420,6 +428,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 table_ttl,
                 clickhouse_settings,
                 using,
+                using_template,
                 copy_grants,
             } => Ok(Self {
                 or_replace,
@@ -461,6 +470,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 table_ttl,
                 clickhouse_settings,
                 using,
+                using_template,
                 copy_grants,
             }),
             _ => Err(ParserError::ParserError(format!(