Fix comments

Author: osipovartem

src/ast/ddl.rs

@@ -30,11 +30,11 @@ use sqlparser_derive::{Visit, VisitMut};
 
 use crate::ast::value::escape_single_quote_string;
 use crate::ast::{
-    display_comma_separated, display_separated, ArgMode, CatalogSyncNamespaceMode, CommentDef,
-    ContactEntry, CreateFunctionBody, CreateFunctionUsing, DataType, Expr, FunctionBehavior,
-    FunctionCalledOnNull, FunctionDeterminismSpecifier, FunctionParallel, Ident, IndexColumn,
-    MySQLColumnPosition, ObjectName, OperateFunctionArg, OrderByExpr, ProjectionSelect,
-    SequenceOptions, SqlOption, StorageSerializationPolicy, Tag, Value, ValueWithSpan,
+    display_comma_separated, display_separated, ArgMode, CommentDef, CreateFunctionBody,
+    CreateFunctionUsing, DataType, Expr, FunctionBehavior, FunctionCalledOnNull,
+    FunctionDeterminismSpecifier, FunctionParallel, Ident, IndexColumn, MySQLColumnPosition,
+    ObjectName, OperateFunctionArg, OrderByExpr, ProjectionSelect, SequenceOptions, SqlOption, Tag,
+    Value, ValueWithSpan,
 };
 use crate::keywords::Keyword;
 use crate::tokenizer::Token;
@@ -2524,104 +2524,3 @@ impl fmt::Display for CreateConnector {
         Ok(())
     }
 }
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
-pub struct CreateSnowflakeDatabase {
-    pub or_replace: bool,
-    pub transient: bool,
-    pub if_not_exists: bool,
-    pub name: ObjectName,
-    pub clone: Option<ObjectName>,
-    pub data_retention_time_in_days: Option<u64>,
-    pub max_data_extension_time_in_days: Option<u64>,
-    pub external_volume: Option<String>,
-    pub catalog: Option<String>,
-    pub replace_invalid_characters: Option<bool>,
-    pub default_ddl_collation: Option<String>,
-    pub storage_serialization_policy: Option<StorageSerializationPolicy>,
-    pub comment: Option<String>,
-    pub catalog_sync: Option<String>,
-    pub catalog_sync_namespace_mode: Option<CatalogSyncNamespaceMode>,
-    pub catalog_sync_namespace_flatten_delimiter: Option<String>,
-    pub with_tags: Option<Vec<Tag>>,
-    pub with_contacts: Option<Vec<ContactEntry>>,
-}
-
-impl fmt::Display for CreateSnowflakeDatabase {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "CREATE {or_replace}{transient}DATABASE {if_not_exists}{name}",
-            or_replace = if self.or_replace { "OR REPLACE " } else { "" },
-            transient = if self.transient { "TRANSIENT " } else { "" },
-            if_not_exists = if self.if_not_exists {
-                "IF NOT EXISTS "
-            } else {
-                ""
-            },
-            name = self.name,
-        )?;
-
-        if let Some(clone) = &self.clone {
-            write!(f, " CLONE {clone}")?;
-        }
-
-        if let Some(value) = self.data_retention_time_in_days {
-            write!(f, " DATA_RETENTION_TIME_IN_DAYS = {value}")?;
-        }
-
-        if let Some(value) = self.max_data_extension_time_in_days {
-            write!(f, " MAX_DATA_EXTENSION_TIME_IN_DAYS = {value}")?;
-        }
-
-        if let Some(vol) = &self.external_volume {
-            write!(f, " EXTERNAL_VOLUME = '{vol}'")?;
-        }
-
-        if let Some(cat) = &self.catalog {
-            write!(f, " CATALOG = '{cat}'")?;
-        }
-
-        if let Some(true) = self.replace_invalid_characters {
-            write!(f, " REPLACE_INVALID_CHARACTERS = TRUE")?;
-        } else if let Some(false) = self.replace_invalid_characters {
-            write!(f, " REPLACE_INVALID_CHARACTERS = FALSE")?;
-        }
-
-        if let Some(collation) = &self.default_ddl_collation {
-            write!(f, " DEFAULT_DDL_COLLATION = '{collation}'")?;
-        }
-
-        if let Some(policy) = &self.storage_serialization_policy {
-            write!(f, " STORAGE_SERIALIZATION_POLICY = {policy}")?;
-        }
-
-        if let Some(comment) = &self.comment {
-            write!(f, " COMMENT = '{comment}'")?;
-        }
-
-        if let Some(sync) = &self.catalog_sync {
-            write!(f, " CATALOG_SYNC = '{sync}'")?;
-        }
-
-        if let Some(mode) = &self.catalog_sync_namespace_mode {
-            write!(f, " CATALOG_SYNC_NAMESPACE_MODE = {mode}")?;
-        }
-
-        if let Some(delim) = &self.catalog_sync_namespace_flatten_delimiter {
-            write!(f, " CATALOG_SYNC_NAMESPACE_FLATTEN_DELIMITER = '{delim}'")?;
-        }
-
-        if let Some(tags) = &self.with_tags {
-            write!(f, " WITH TAG ({})", display_comma_separated(tags))?;
-        }
-
-        if let Some(contacts) = &self.with_contacts {
-            write!(f, " WITH CONTACT ({})", display_comma_separated(contacts))?;
-        }
-
-        Ok(())
-    }
-}

src/ast/helpers/stmt_create_database.rs

@@ -24,7 +24,6 @@ use serde::{Deserialize, Serialize};
 #[cfg(feature = "visitor")]
 use sqlparser_derive::{Visit, VisitMut};
 
-use crate::ast::ddl::CreateSnowflakeDatabase;
 use crate::ast::{
     CatalogSyncNamespaceMode, ContactEntry, ObjectName, Statement, StorageSerializationPolicy, Tag,
 };
@@ -51,15 +50,17 @@ use crate::parser::ParserError;
 /// )
 /// ```
 ///
-/// [1]: Statement::CreateSnowflakeDatabase
+/// [1]: Statement::CreateDatabase
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct CreateDatabaseBuilder {
+    pub db_name: ObjectName,
+    pub if_not_exists: bool,
+    pub location: Option<String>,
+    pub managed_location: Option<String>,
     pub or_replace: bool,
     pub transient: bool,
-    pub if_not_exists: bool,
-    pub name: ObjectName,
     pub clone: Option<ObjectName>,
     pub data_retention_time_in_days: Option<u64>,
     pub max_data_extension_time_in_days: Option<u64>,
@@ -79,10 +80,12 @@ pub struct CreateDatabaseBuilder {
 impl CreateDatabaseBuilder {
     pub fn new(name: ObjectName) -> Self {
         Self {
+            db_name: name,
+            if_not_exists: false,
+            location: None,
+            managed_location: None,
             or_replace: false,
             transient: false,
-            if_not_exists: false,
-            name,
             clone: None,
             data_retention_time_in_days: None,
             max_data_extension_time_in_days: None,
@@ -100,6 +103,16 @@ impl CreateDatabaseBuilder {
         }
     }
 
+    pub fn location(mut self, location: Option<String>) -> Self {
+        self.location = location;
+        self
+    }
+
+    pub fn managed_location(mut self, managed_location: Option<String>) -> Self {
+        self.managed_location = managed_location;
+        self
+    }
+
     pub fn or_replace(mut self, or_replace: bool) -> Self {
         self.or_replace = or_replace;
         self
@@ -198,11 +211,13 @@ impl CreateDatabaseBuilder {
     }
 
     pub fn build(self) -> Statement {
-        Statement::CreateSnowflakeDatabase(CreateSnowflakeDatabase {
+        Statement::CreateDatabase {
+            db_name: self.db_name,
+            if_not_exists: self.if_not_exists,
+            managed_location: self.managed_location,
+            location: self.location,
             or_replace: self.or_replace,
             transient: self.transient,
-            if_not_exists: self.if_not_exists,
-            name: self.name,
             clone: self.clone,
             data_retention_time_in_days: self.data_retention_time_in_days,
             max_data_extension_time_in_days: self.max_data_extension_time_in_days,
@@ -217,7 +232,7 @@ impl CreateDatabaseBuilder {
             catalog_sync_namespace_flatten_delimiter: self.catalog_sync_namespace_flatten_delimiter,
             with_tags: self.with_tags,
             with_contacts: self.with_contacts,
-        })
+        }
     }
 }
 
@@ -226,11 +241,13 @@ impl TryFrom<Statement> for CreateDatabaseBuilder {
 
     fn try_from(stmt: Statement) -> Result<Self, Self::Error> {
         match stmt {
-            Statement::CreateSnowflakeDatabase(CreateSnowflakeDatabase {
+            Statement::CreateDatabase {
+                db_name,
+                if_not_exists,
+                location,
+                managed_location,
                 or_replace,
                 transient,
-                if_not_exists,
-                name,
                 clone,
                 data_retention_time_in_days,
                 max_data_extension_time_in_days,
@@ -245,11 +262,13 @@ impl TryFrom<Statement> for CreateDatabaseBuilder {
                 catalog_sync_namespace_flatten_delimiter,
                 with_tags,
                 with_contacts,
-            }) => Ok(Self {
+            } => Ok(Self {
+                db_name,
+                if_not_exists,
+                location,
+                managed_location,
                 or_replace,
                 transient,
-                if_not_exists,
-                name,
                 clone,
                 data_retention_time_in_days,
                 max_data_extension_time_in_days,