Fix clippy

Author: osipovartem

src/ast/ddl.rs

@@ -31,7 +31,7 @@ use sqlparser_derive::{Visit, VisitMut};
 use crate::ast::value::escape_single_quote_string;
 use crate::ast::{
     display_comma_separated, display_separated, ArgMode, CatalogSyncNamespaceMode, CommentDef,
-    CreateFunctionBody, CreateFunctionUsing, DataType, Expr, FunctionBehavior,
+    ContactEntry, CreateFunctionBody, CreateFunctionUsing, DataType, Expr, FunctionBehavior,
     FunctionCalledOnNull, FunctionDeterminismSpecifier, FunctionParallel, Ident, IndexColumn,
     MySQLColumnPosition, ObjectName, OperateFunctionArg, OrderByExpr, ProjectionSelect,
     SequenceOptions, SqlOption, StorageSerializationPolicy, Tag, Value, ValueWithSpan,
@@ -2546,7 +2546,7 @@ pub struct CreateSnowflakeDatabase {
     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<(String, String)>>,
+    pub with_contacts: Option<Vec<ContactEntry>>,
 }
 
 impl fmt::Display for CreateSnowflakeDatabase {
@@ -2619,16 +2619,7 @@ impl fmt::Display for CreateSnowflakeDatabase {
         }
 
         if let Some(contacts) = &self.with_contacts {
-            write!(
-                f,
-                " WITH CONTACT ({})",
-                display_comma_separated(
-                    &contacts
-                        .iter()
-                        .map(|(purpose, contact)| format!("{purpose} = {contact}"))
-                        .collect::<Vec<_>>()
-                )
-            )?;
+            write!(f, " WITH CONTACT ({})", display_comma_separated(contacts))?;
         }
 
         Ok(())

src/ast/helpers/stmt_create_database.rs

@@ -26,7 +26,7 @@ use sqlparser_derive::{Visit, VisitMut};
 
 use crate::ast::ddl::CreateSnowflakeDatabase;
 use crate::ast::{
-    CatalogSyncNamespaceMode, ObjectName, Statement, StorageSerializationPolicy, Tag,
+    CatalogSyncNamespaceMode, ContactEntry, ObjectName, Statement, StorageSerializationPolicy, Tag,
 };
 use crate::parser::ParserError;
 
@@ -51,7 +51,6 @@ use crate::parser::ParserError;
 /// )
 /// ```
 ///
-/// [1]: crate::ast::Statement::CreateSnowflakeDatabase
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
@@ -73,7 +72,7 @@ pub struct CreateDatabaseBuilder {
     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<(String, String)>>,
+    pub with_contacts: Option<Vec<ContactEntry>>,
 }
 
 impl CreateDatabaseBuilder {
@@ -192,7 +191,7 @@ impl CreateDatabaseBuilder {
         self
     }
 
-    pub fn with_contacts(mut self, with_contacts: Option<Vec<(String, String)>>) -> Self {
+    pub fn with_contacts(mut self, with_contacts: Option<Vec<ContactEntry>>) -> Self {
         self.with_contacts = with_contacts;
         self
     }
@@ -275,7 +274,6 @@ impl TryFrom<Statement> for CreateDatabaseBuilder {
 #[cfg(test)]
 mod tests {
     use crate::ast::helpers::stmt_create_database::CreateDatabaseBuilder;
-    use crate::ast::helpers::stmt_create_table::CreateTableBuilder;
     use crate::ast::{Ident, ObjectName, Statement};
     use crate::parser::ParserError;
 

src/ast/mod.rs

@@ -9550,6 +9550,29 @@ impl Display for Tag {
     }
 }
 
+/// Snowflake `WITH CONTACT ( purpose = contact [ , purpose = contact ...] )`
+///
+/// <https://docs.snowflake.com/en/sql-reference/sql/create-database>
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
+pub struct ContactEntry {
+    pub purpose: String,
+    pub contact: String,
+}
+
+impl ContactEntry {
+    pub fn new(purpose: String, contact: String) -> Self {
+        Self { purpose, contact }
+    }
+}
+
+impl Display for ContactEntry {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} = {}", self.purpose, self.contact)
+    }
+}
+
 /// Helper to indicate if a comment includes the `=` in the display form
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]

src/dialect/snowflake.rs

@@ -24,7 +24,7 @@ use crate::ast::helpers::stmt_data_loading::{
     FileStagingCommand, StageLoadSelectItem, StageLoadSelectItemKind, StageParamsObject,
 };
 use crate::ast::{
-    CatalogSyncNamespaceMode, ColumnOption, ColumnPolicy, ColumnPolicyProperty,
+    CatalogSyncNamespaceMode, ColumnOption, ColumnPolicy, ColumnPolicyProperty, ContactEntry,
     CopyIntoSnowflakeKind, Ident, IdentityParameters, IdentityProperty, IdentityPropertyFormatKind,
     IdentityPropertyKind, IdentityPropertyOrder, ObjectName, ObjectNamePart, RowAccessPolicy,
     ShowObjects, SqlOption, Statement, StorageSerializationPolicy, TagsColumnOption,
@@ -826,7 +826,7 @@ pub fn parse_create_database(
                             let purpose = p.parse_identifier()?.value;
                             p.expect_token(&Token::Eq)?;
                             let contact = p.parse_identifier()?.value;
-                            Ok((purpose, contact))
+                            Ok(ContactEntry::new(purpose, contact))
                         })?;
                         parser.expect_token(&Token::RParen)?;
                         builder = builder.with_contacts(Some(contacts));

tests/sqlparser_snowflake.rs

@@ -4374,9 +4374,9 @@ fn test_snowflake_identifier_function() {
 
     // Using IDENTIFIER to reference a database
     match snowflake().verified_stmt("CREATE DATABASE IDENTIFIER('tbl')") {
-        Statement::CreateDatabase { db_name, .. } => {
+        Statement::CreateSnowflakeDatabase(CreateSnowflakeDatabase { name, .. }) => {
             assert_eq!(
-                db_name,
+                name,
                 ObjectName(vec![ObjectNamePart::Function(ObjectNamePartFunction {
                     name: Ident::new("IDENTIFIER"),
                     args: vec![FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(