upgrade to 0.55.0

MichaelScofield · MichaelScofield · commit b1f359ab9f45 · 2025-09-29T13:55:21.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ bigdecimal-sql = ["bigdecimal", "df_sqlparser/bigdecimal"]
 
 [dependencies]
 bigdecimal = { version = "0.4.1", features = ["serde"], optional = true }
-df_sqlparser = { package = "sqlparser", version = "0.54.0" }
+df_sqlparser = { package = "sqlparser", version = "0.55.0" }
 log = "0.4"
 recursive = { version = "0.1.1", optional = true}
 
diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
@@ -984,7 +984,7 @@ impl fmt::Display for CharLengthUnits {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum BinaryLength {
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
@@ -808,7 +808,7 @@ impl fmt::Display for AlterIndexOperation {
 }
 
 /// An `ALTER TYPE` statement (`Statement::AlterType`)
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct AlterType {
@@ -817,7 +817,7 @@ pub struct AlterType {
 }
 
 /// An [AlterType] operation
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum AlterTypeOperation {
@@ -827,15 +827,15 @@ pub enum AlterTypeOperation {
 }
 
 /// See [AlterTypeOperation::Rename]
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct AlterTypeRename {
     pub new_name: Ident,
 }
 
 /// See [AlterTypeOperation::AddValue]
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct AlterTypeAddValue {
@@ -845,7 +845,7 @@ pub struct AlterTypeAddValue {
 }
 
 /// See [AlterTypeAddValue]
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum AlterTypeAddValuePosition {
@@ -854,7 +854,7 @@ pub enum AlterTypeAddValuePosition {
 }
 
 /// See [AlterTypeOperation::RenameValue]
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct AlterTypeRenameValue {
@@ -2478,7 +2478,7 @@ impl fmt::Display for CreateFunction {
 /// ```
 ///
 /// [Hive](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=27362034#LanguageManualDDL-CreateDataConnectorCreateConnector)
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct CreateConnector {
diff --git a/src/ast/helpers/key_value_options.rs b/src/ast/helpers/key_value_options.rs
@@ -28,17 +28,21 @@ use core::fmt::Formatter;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+use crate::ast::Convert;
+use sqlparser_derive::DFConvert;
 #[cfg(feature = "visitor")]
 use sqlparser_derive::{Visit, VisitMut};
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, DFConvert)]
+#[df_path(df_sqlparser::ast::helpers::key_value_options)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct KeyValueOptions {
     pub options: Vec<KeyValueOption>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, DFConvert)]
+#[df_path(df_sqlparser::ast::helpers::key_value_options)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum KeyValueOptionType {
@@ -48,7 +52,8 @@ pub enum KeyValueOptionType {
     NUMBER,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, DFConvert)]
+#[df_path(df_sqlparser::ast::helpers::key_value_options)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct KeyValueOption {
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
@@ -381,7 +381,7 @@ impl fmt::Display for ObjectName {
 }
 
 /// A single part of an ObjectName
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum ObjectNamePart {
@@ -727,7 +727,7 @@ pub enum CeilFloorKind {
 
 /// A WHEN clause in a CASE expression containing both
 /// the condition and its corresponding result
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct CaseWhen {
@@ -6807,7 +6807,7 @@ impl fmt::Display for Action {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -6854,7 +6854,7 @@ impl fmt::Display for ActionCreateObjectType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -6889,7 +6889,7 @@ impl fmt::Display for ActionApplyType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -6914,7 +6914,7 @@ impl fmt::Display for ActionExecuteObjectType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -6943,7 +6943,7 @@ impl fmt::Display for ActionManageType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -6966,7 +6966,7 @@ impl fmt::Display for ActionModifyType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 /// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>
@@ -9849,7 +9849,7 @@ impl fmt::Display for ShowStatementIn {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct ShowObjects {
@@ -10055,7 +10055,7 @@ impl fmt::Display for SessionParamValue {
 /// ```
 ///
 /// <https://docs.snowflake.com/en/sql-reference/sql/create-iceberg-table>
-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum StorageSerializationPolicy {
@@ -10073,7 +10073,7 @@ impl Display for StorageSerializationPolicy {
 }
 
 /// Variants of the Snowflake `COPY INTO` statement
-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum CopyIntoSnowflakeKind {
diff --git a/src/ast/query.rs b/src/ast/query.rs
@@ -292,7 +292,7 @@ impl fmt::Display for Table {
 }
 
 /// What did this select look like?
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum SelectFlavor {
@@ -686,7 +686,7 @@ impl fmt::Display for Cte {
 
 /// Represents an expression behind a wildcard expansion in a projection.
 /// `SELECT T.* FROM T;
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum SelectItemQualifiedWildcardKind {
@@ -1123,7 +1123,7 @@ pub struct TableFunctionArgs {
     pub settings: Option<Vec<Setting>>,
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum TableIndexHintType {
@@ -1142,7 +1142,7 @@ impl fmt::Display for TableIndexHintType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum TableIndexType {
@@ -1159,7 +1159,7 @@ impl fmt::Display for TableIndexType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum TableIndexHintForClause {
@@ -1178,7 +1178,7 @@ impl fmt::Display for TableIndexHintForClause {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct TableIndexHints {
diff --git a/src/ast/value.rs b/src/ast/value.rs
@@ -72,7 +72,7 @@ use crate::ast::DFConvert;
 /// // convert back to `Value`
 /// let value: Value = value_with_span.into();
 /// ```
-#[derive(Debug, Clone, Eq)]
+#[derive(Debug, Clone, Eq, DFConvert)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub struct ValueWithSpan {
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -1269,7 +1269,7 @@ impl<'a> Parser<'a> {
                 self.expect_token(&Token::RParen)?;
                 expr
             } else if let Ok(value) = self.parse_value() {
-                value.verify_duration()?;
+                value.value.verify_duration()?;
                 Expr::Value(value)
             } else {
                 self.index = index;
@@ -1299,10 +1299,10 @@ impl<'a> Parser<'a> {
                 let args = vec![
                     FunctionArg::Unnamed(FunctionArgExpr::Expr(e.clone())),
                     FunctionArg::Unnamed(FunctionArgExpr::Expr(range.clone())),
-                    FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(fill.clone()))),
+                    FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(fill.clone().into()))),
                 ];
                 let range_func = Function {
-                    name: ObjectName(vec![Ident::new("range_fn")]),
+                    name: vec![Ident::new("range_fn")].into(),
                     over: None,
                     filter: None,
                     null_treatment: None,
@@ -12011,7 +12011,7 @@ impl<'a> Parser<'a> {
                     expr
                 } else {
                     let value = self.parse_value()?;
-                    value.verify_duration()?;
+                    value.value.verify_duration()?;
                     Expr::Value(value)
                 };
                 let to = if self.parse_keyword(Keyword::TO) {
@@ -12021,12 +12021,15 @@ impl<'a> Parser<'a> {
                         expr
                     } else {
                         let value = self.next_token().to_string();
-                        Expr::Value(Value::SingleQuotedString(
-                            value.trim_matches(|x| x == '\'' || x == '"').to_string(),
-                        ))
+                        Expr::Value(
+                            Value::SingleQuotedString(
+                                value.trim_matches(|x| x == '\'' || x == '"').to_string(),
+                            )
+                            .into(),
+                        )
                     }
                 } else {
-                    Expr::Value(Value::SingleQuotedString(String::new()))
+                    Expr::Value(Value::SingleQuotedString(String::new()).into())
                 };
                 let by = if self.parse_keyword(Keyword::BY) {
                     self.expect_token(&Token::LParen)?;
@@ -12038,11 +12041,13 @@ impl<'a> Parser<'a> {
                         // `()` == `(1)`
                         #[cfg(not(feature = "bigdecimal-sql"))]
                         {
-                            vec![Expr::Value(Value::Number("1".into(), false))]
+                            vec![Expr::Value(Value::Number("1".into(), false).into())]
                         }
                         #[cfg(feature = "bigdecimal-sql")]
                         {
-                            vec![Expr::Value(Value::Number(BigDecimal::from(1), false))]
+                            vec![Expr::Value(
+                                Value::Number(BigDecimal::from(1), false).into(),
+                            )]
                         }
                     } else {
                         let by = self.parse_comma_separated(Parser::parse_expr)?;
@@ -12071,7 +12076,7 @@ impl<'a> Parser<'a> {
         let projection = if let Some((align, to, by)) = align {
             let fill = fill.unwrap_or_default();
             let by_num = FunctionArg::Unnamed(FunctionArgExpr::Expr(Expr::Value(
-                Value::SingleQuotedString(by.len().to_string()),
+                Value::SingleQuotedString(by.len().to_string()).into(),
             )));
             let mut fake_group_by = HashSet::new();
             let by = by
@@ -12088,7 +12093,7 @@ impl<'a> Parser<'a> {
                 rewrite_calculation_expr(&expr, true, &mut |e: &Expr| match e {
                     Expr::Function(func) => {
                         if let Some(name) = func.name.0.first() {
-                            if name.value.as_str() == "range_fn" {
+                            if name.to_string() == "range_fn" {
                                 let mut range_func = func.clone();
                                 let FunctionArguments::List(args) = &mut range_func.args else {
                                     unreachable!()
@@ -12101,7 +12106,10 @@ impl<'a> Parser<'a> {
                                 }
                                 // use global fill if fill not given in range select item
                                 if let Some(FunctionArg::Unnamed(FunctionArgExpr::Expr(
-                                    Expr::Value(Value::SingleQuotedString(value)),
+                                    Expr::Value(ValueWithSpan {
+                                        value: Value::SingleQuotedString(value),
+                                        ..
+                                    }),
                                 ))) = args.args.last_mut()
                                 {
                                     if value.is_empty() {
@@ -12164,7 +12172,7 @@ impl<'a> Parser<'a> {
                 rewrite_calculation_expr(expr, true, &mut |e: &Expr| match e {
                     Expr::Function(func) => {
                         if let Some(name) = func.name.0.first() {
-                            if name.value.as_str() == "range_fn" {
+                            if name.to_string() == "range_fn" {
                                 let FunctionArguments::List(args) = &func.args else {
                                     unreachable!()
                                 };
@@ -12185,11 +12193,8 @@ impl<'a> Parser<'a> {
             projection
                 .iter()
                 .map(|select_item| {
-                    match select_item {
-                        SelectItem::UnnamedExpr(expr) => {
-                            align_fill_validate(expr)?;
-                        }
-                        _ => {}
+                    if let SelectItem::UnnamedExpr(expr) = select_item {
+                        align_fill_validate(expr)?;
                     }
                     Ok(())
                 })

Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,7 @@ impl fmt::Display for CharLengthUnits {`
`984`	`984`	`}`
`985`	`985`	`}`
`986`	`986`
`987`		`-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`987`	`+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`988`	`988`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`989`	`989`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`990`	`990`	`pub enum BinaryLength {`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ impl fmt::Display for ObjectName {`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`/// A single part of an ObjectName`
`384`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`384`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`385`	`385`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`386`	`386`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`387`	`387`	`pub enum ObjectNamePart {`
`@@ -727,7 +727,7 @@ pub enum CeilFloorKind {`
`727`	`727`
`728`	`728`	`/// A WHEN clause in a CASE expression containing both`
`729`	`729`	`/// the condition and its corresponding result`
`730`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`730`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`731`	`731`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`732`	`732`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`733`	`733`	`pub struct CaseWhen {`
`@@ -6807,7 +6807,7 @@ impl fmt::Display for Action {`
`6807`	`6807`	`}`
`6808`	`6808`	`}`
`6809`	`6809`
`6810`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6810`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6811`	`6811`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6812`	`6812`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6813`	`6813`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -6854,7 +6854,7 @@ impl fmt::Display for ActionCreateObjectType {`
`6854`	`6854`	`}`
`6855`	`6855`	`}`
`6856`	`6856`
`6857`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6857`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6858`	`6858`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6859`	`6859`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6860`	`6860`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -6889,7 +6889,7 @@ impl fmt::Display for ActionApplyType {`
`6889`	`6889`	`}`
`6890`	`6890`	`}`
`6891`	`6891`
`6892`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6892`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6893`	`6893`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6894`	`6894`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6895`	`6895`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -6914,7 +6914,7 @@ impl fmt::Display for ActionExecuteObjectType {`
`6914`	`6914`	`}`
`6915`	`6915`	`}`
`6916`	`6916`
`6917`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6917`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6918`	`6918`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6919`	`6919`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6920`	`6920`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -6943,7 +6943,7 @@ impl fmt::Display for ActionManageType {`
`6943`	`6943`	`}`
`6944`	`6944`	`}`
`6945`	`6945`
`6946`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6946`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6947`	`6947`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6948`	`6948`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6949`	`6949`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -6966,7 +6966,7 @@ impl fmt::Display for ActionModifyType {`
`6966`	`6966`	`}`
`6967`	`6967`	`}`
`6968`	`6968`
`6969`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`6969`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`6970`	`6970`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`6971`	`6971`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`6972`	`6972`	`/// See <https://docs.snowflake.com/en/sql-reference/sql/grant-privilege>`
`@@ -9849,7 +9849,7 @@ impl fmt::Display for ShowStatementIn {`
`9849`	`9849`	`}`
`9850`	`9850`	`}`
`9851`	`9851`
`9852`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`9852`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`9853`	`9853`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`9854`	`9854`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`9855`	`9855`	`pub struct ShowObjects {`
`@@ -10055,7 +10055,7 @@ impl fmt::Display for SessionParamValue {`
`10055`	`10055`	/// ```
`10056`	`10056`	`///`
`10057`	`10057`	`/// <https://docs.snowflake.com/en/sql-reference/sql/create-iceberg-table>`
`10058`		`-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`10058`	`+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`10059`	`10059`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`10060`	`10060`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`10061`	`10061`	`pub enum StorageSerializationPolicy {`
`@@ -10073,7 +10073,7 @@ impl Display for StorageSerializationPolicy {`
`10073`	`10073`	`}`
`10074`	`10074`
`10075`	`10075`	/// Variants of the Snowflake `COPY INTO` statement
`10076`		`-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`10076`	`+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`10077`	`10077`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`10078`	`10078`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`10079`	`10079`	`pub enum CopyIntoSnowflakeKind {`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ impl fmt::Display for Table {`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`/// What did this select look like?`
`295`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`295`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`296`	`296`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`297`	`297`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`298`	`298`	`pub enum SelectFlavor {`
`@@ -686,7 +686,7 @@ impl fmt::Display for Cte {`
`686`	`686`
`687`	`687`	`/// Represents an expression behind a wildcard expansion in a projection.`
`688`	`688`	/// `SELECT T.* FROM T;
`689`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`689`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`690`	`690`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`691`	`691`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`692`	`692`	`pub enum SelectItemQualifiedWildcardKind {`
`@@ -1123,7 +1123,7 @@ pub struct TableFunctionArgs {`
`1123`	`1123`	`pub settings: Option<Vec<Setting>>,`
`1124`	`1124`	`}`
`1125`	`1125`
`1126`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`1126`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`1127`	`1127`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`1128`	`1128`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`1129`	`1129`	`pub enum TableIndexHintType {`
`@@ -1142,7 +1142,7 @@ impl fmt::Display for TableIndexHintType {`
`1142`	`1142`	`}`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`1145`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`1146`	`1146`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`1147`	`1147`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`1148`	`1148`	`pub enum TableIndexType {`
`@@ -1159,7 +1159,7 @@ impl fmt::Display for TableIndexType {`
`1159`	`1159`	`}`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`1162`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`1163`	`1163`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`1164`	`1164`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`1165`	`1165`	`pub enum TableIndexHintForClause {`
`@@ -1178,7 +1178,7 @@ impl fmt::Display for TableIndexHintForClause {`
`1178`	`1178`	`}`
`1179`	`1179`	`}`
`1180`	`1180`
`1181`		`-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]`
	`1181`	`+#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, DFConvert)]`
`1182`	`1182`	`#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]`
`1183`	`1183`	`#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]`
`1184`	`1184`	`pub struct TableIndexHints {`