update

Author: chenkovsky

src/ast/ddl.rs

@@ -2580,3 +2580,27 @@ impl fmt::Display for AlterSchemaOperation {
         }
     }
 }
+
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub struct AlterSchema {
+    pub name: ObjectName,
+    pub if_exists: bool,
+    pub operations: Vec<AlterSchemaOperation>,
+}
+
+impl fmt::Display for AlterSchema {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ALTER SCHEMA ")?;
+        if self.if_exists {
+            write!(f, "IF EXISTS ")?;
+        }
+        write!(f, "{}", self.name)?;
+        for operation in &self.operations {
+            write!(f, " {operation}")?;
+        }
+
+        Ok(())
+    }
+}

src/ast/mod.rs

@@ -59,8 +59,8 @@ pub use self::dcl::{
 };
 pub use self::ddl::{
     AlterColumnOperation, AlterConnectorOwner, AlterIndexOperation, AlterPolicyOperation,
-    AlterSchemaOperation, AlterTableAlgorithm, AlterTableLock, AlterTableOperation, AlterType,
-    AlterTypeAddValue, AlterTypeAddValuePosition, AlterTypeOperation, AlterTypeRename,
+    AlterSchema, AlterSchemaOperation, AlterTableAlgorithm, AlterTableLock, AlterTableOperation,
+    AlterType, AlterTypeAddValue, AlterTypeAddValuePosition, AlterTypeOperation, AlterTypeRename,
     AlterTypeRenameValue, ClusteredBy, ColumnDef, ColumnOption, ColumnOptionDef, ColumnOptions,
     ColumnPolicy, ColumnPolicyProperty, ConstraintCharacteristics, CreateConnector, CreateDomain,
     CreateFunction, Deduplicate, DeferrableInitial, DropBehavior, GeneratedAs,
@@ -3384,13 +3384,7 @@ pub enum Statement {
     /// ALTER SCHEMA
     /// ```
     /// See [BigQuery](https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#alter_schema_collate_statement)
-    AlterSchema {
-        /// Schema name
-        #[cfg_attr(feature = "visitor", visit(with = "visit_relation"))]
-        name: ObjectName,
-        if_exists: bool,
-        operations: Vec<AlterSchemaOperation>,
-    },
+    AlterSchema(AlterSchema),
     /// ```sql
     /// ALTER INDEX
     /// ```
@@ -6220,15 +6214,7 @@ impl fmt::Display for Statement {
             Statement::Remove(command) => write!(f, "REMOVE {command}"),
             Statement::ExportData(e) => write!(f, "{e}"),
             Statement::CreateUser(s) => write!(f, "{s}"),
-            Statement::AlterSchema {
-                name, operations, ..
-            } => {
-                write!(f, "ALTER SCHEMA {name}")?;
-                for operation in operations {
-                    write!(f, " {operation}")?;
-                }
-                Ok(())
-            }
+            Statement::AlterSchema(s) => write!(f, "{s}"),
         }
     }
 }

src/ast/spans.rs

@@ -16,7 +16,8 @@
 // under the License.
 
 use crate::ast::{
-    query::SelectItemQualifiedWildcardKind, AlterSchemaOperation, ColumnOptions, ExportData,
+    ddl::AlterSchema, query::SelectItemQualifiedWildcardKind, AlterSchemaOperation, ColumnOptions,
+    ExportData,
 };
 use core::iter;
 
@@ -545,11 +546,7 @@ impl Spanned for Statement {
                     .chain(connection.iter().map(|i| i.span())),
             ),
             Statement::CreateUser(..) => Span::empty(),
-            Statement::AlterSchema {
-                name, operations, ..
-            } => union_spans(
-                core::iter::once(name.span()).chain(operations.iter().map(|i| i.span())),
-            ),
+            Statement::AlterSchema(s) => s.span(),
         }
     }
 }
@@ -2395,6 +2392,14 @@ impl Spanned for AlterSchemaOperation {
     }
 }
 
+impl Spanned for AlterSchema {
+    fn span(&self) -> Span {
+        union_spans(
+            core::iter::once(self.name.span()).chain(self.operations.iter().map(|i| i.span())),
+        )
+    }
+}
+
 #[cfg(test)]
 pub mod tests {
     use crate::dialect::{Dialect, GenericDialect, SnowflakeDialect};

src/parser/mod.rs

@@ -9111,7 +9111,11 @@ impl<'a> Parser<'a> {
             Keyword::SCHEMA,
         ])?;
         match object_type {
-            Keyword::SCHEMA => self.parse_alter_schema(),
+            Keyword::SCHEMA => {
+                self.prev_token();
+                self.prev_token();
+                self.parse_alter_schema()
+            }
             Keyword::VIEW => self.parse_alter_view(),
             Keyword::TYPE => self.parse_alter_type(),
             Keyword::TABLE => self.parse_alter_table(false),
@@ -9243,7 +9247,10 @@ impl<'a> Parser<'a> {
         }
     }
 
+    // Parse a [Statement::AlterSchema]
+    // ALTER SCHEMA [ IF EXISTS ] schema_name
     pub fn parse_alter_schema(&mut self) -> Result<Statement, ParserError> {
+        self.expect_keywords(&[Keyword::ALTER, Keyword::SCHEMA])?;
         let if_exists = self.parse_keywords(&[Keyword::IF, Keyword::EXISTS]);
         let name = self.parse_object_name(false)?;
         let operation = if self.parse_keywords(&[Keyword::SET, Keyword::OPTIONS]) {
@@ -9265,16 +9272,13 @@ impl<'a> Parser<'a> {
             let replica = self.parse_identifier()?;
             AlterSchemaOperation::DropReplica { replica }
         } else {
-            return self.expected_ref(
-                "{SET OPTIONS | SET DEFAULT COLLATE | ADD REPLICA | DROP REPLICA}",
-                self.peek_token_ref(),
-            );
+            return self.expected_ref("ALTER SCHEMA operation", self.peek_token_ref());
         };
-        Ok(Statement::AlterSchema {
+        Ok(Statement::AlterSchema(AlterSchema {
             name,
             if_exists,
             operations: vec![operation],
-        })
+        }))
     }
 
     /// Parse a `CALL procedure_name(arg1, arg2, ...)`

tests/sqlparser_bigquery.rs

@@ -2808,21 +2808,13 @@ fn test_begin_statement() {
 }
 
 #[test]
-fn test_alter_schema_default_collate() {
+fn test_alter_schema() {
     bigquery_and_generic().verified_stmt("ALTER SCHEMA mydataset SET DEFAULT COLLATE 'und:ci'");
-}
-
-#[test]
-fn test_alter_schema_add_replica() {
     bigquery_and_generic().verified_stmt("ALTER SCHEMA mydataset ADD REPLICA 'us'");
-}
-
-#[test]
-fn test_alter_schema_drop_replica() {
+    bigquery_and_generic()
+        .verified_stmt("ALTER SCHEMA mydataset ADD REPLICA 'us' OPTIONS (location = 'us')");
     bigquery_and_generic().verified_stmt("ALTER SCHEMA mydataset DROP REPLICA 'us'");
-}
-
-#[test]
-fn test_alter_schema_set_options() {
     bigquery_and_generic().verified_stmt("ALTER SCHEMA mydataset SET OPTIONS (location = 'us')");
+    bigquery_and_generic()
+        .verified_stmt("ALTER SCHEMA IF EXISTS mydataset SET OPTIONS (location = 'us')");
 }