mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-08-22 06:54:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Treat COLLATE like any other column option (#1731)

Browse source
This commit is contained in:
Michael Victor Zink 2025-02-19 21:26:20 -08:00 • committed by GitHub
parent b482562618
commit 97f0be6991
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 60 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ast/ddl.rs
View file

@ -1206,7 +1206,6 @@ impl fmt::Display for ProcedureParam {
pub struct ColumnDef { pub struct ColumnDef {
pub name: Ident, pub name: Ident,
pub data_type: DataType, pub data_type: DataType,
pub collation: Option<ObjectName>,
pub options: Vec<ColumnOptionDef>, pub options: Vec<ColumnOptionDef>,
} }
@ -1217,9 +1216,6 @@ impl fmt::Display for ColumnDef {
} else { } else {
write!(f, "{} {}", self.name, self.data_type)?; write!(f, "{} {}", self.name, self.data_type)?;
} }
if let Some(collation) = &self.collation {
write!(f, " COLLATE {collation}")?;
}
for option in &self.options { for option in &self.options {
write!(f, " {option}")?; write!(f, " {option}")?;
} }
@ -1566,6 +1562,7 @@ pub enum ColumnOption {
/// - ... /// - ...
DialectSpecific(Vec<Token>), DialectSpecific(Vec<Token>),
CharacterSet(ObjectName), CharacterSet(ObjectName),
Collation(ObjectName),
Comment(String), Comment(String),
OnUpdate(Expr), OnUpdate(Expr),
/// `Generated`s are modifiers that follow a column definition in a `CREATE /// `Generated`s are modifiers that follow a column definition in a `CREATE
@ -1665,6 +1662,7 @@ impl fmt::Display for ColumnOption {
Check(expr) => write!(f, "CHECK ({expr})"), Check(expr) => write!(f, "CHECK ({expr})"),
DialectSpecific(val) => write!(f, "{}", display_separated(val, " ")), DialectSpecific(val) => write!(f, "{}", display_separated(val, " ")),
CharacterSet(n) => write!(f, "CHARACTER SET {n}"), CharacterSet(n) => write!(f, "CHARACTER SET {n}"),
Collation(n) => write!(f, "COLLATE {n}"),
Comment(v) => write!(f, "COMMENT '{}'", escape_single_quote_string(v)), Comment(v) => write!(f, "COMMENT '{}'", escape_single_quote_string(v)),
OnUpdate(expr) => write!(f, "ON UPDATE {expr}"), OnUpdate(expr) => write!(f, "ON UPDATE {expr}"),
Generated { Generated {

1
src/ast/helpers/stmt_create_table.rs
View file

@ -47,7 +47,6 @@ use crate::parser::ParserError;
/// .columns(vec![ColumnDef { /// .columns(vec![ColumnDef {
/// name: Ident::new("c1"), /// name: Ident::new("c1"),
/// data_type: DataType::Int(None), /// data_type: DataType::Int(None),
/// collation: None,
/// options: vec![], /// options: vec![],
/// }]); /// }]);
/// // You can access internal elements with ease /// // You can access internal elements with ease

8
src/ast/spans.rs
View file

@ -604,15 +604,10 @@ impl Spanned for ColumnDef {
let ColumnDef { let ColumnDef {
name, name,
data_type: _, // enum data_type: _, // enum
collation,
options, options,
} = self; } = self;
union_spans( union_spans(core::iter::once(name.span).chain(options.iter().map(|i| i.span())))
core::iter::once(name.span)
.chain(collation.iter().map(|i| i.span()))
.chain(options.iter().map(|i| i.span())),
)
} }
} }
@ -767,6 +762,7 @@ impl Spanned for ColumnOption {
ColumnOption::Check(expr) => expr.span(), ColumnOption::Check(expr) => expr.span(),
ColumnOption::DialectSpecific(_) => Span::empty(), ColumnOption::DialectSpecific(_) => Span::empty(),
ColumnOption::CharacterSet(object_name) => object_name.span(), ColumnOption::CharacterSet(object_name) => object_name.span(),
ColumnOption::Collation(object_name) => object_name.span(),
ColumnOption::Comment(_) => Span::empty(), ColumnOption::Comment(_) => Span::empty(),
ColumnOption::OnUpdate(expr) => expr.span(), ColumnOption::OnUpdate(expr) => expr.span(),
ColumnOption::Generated { .. } => Span::empty(), ColumnOption::Generated { .. } => Span::empty(),

15
src/parser/mod.rs
View file

@ -6889,11 +6889,6 @@ impl<'a> Parser<'a> {
} else { } else {
self.parse_data_type()? self.parse_data_type()?
}; };
let mut collation = if self.parse_keyword(Keyword::COLLATE) {
Some(self.parse_object_name(false)?)
} else {
None
};
let mut options = vec![]; let mut options = vec![];
loop { loop {
if self.parse_keyword(Keyword::CONSTRAINT) { if self.parse_keyword(Keyword::CONSTRAINT) {
@ -6908,10 +6903,6 @@ impl<'a> Parser<'a> {
} }
} else if let Some(option) = self.parse_optional_column_option()? { } else if let Some(option) = self.parse_optional_column_option()? {
options.push(ColumnOptionDef { name: None, option }); options.push(ColumnOptionDef { name: None, option });
} else if dialect_of!(self is MySqlDialect | SnowflakeDialect | GenericDialect)
&& self.parse_keyword(Keyword::COLLATE)
{
collation = Some(self.parse_object_name(false)?);
} else { } else {
break; break;
}; };
@ -6919,7 +6910,6 @@ impl<'a> Parser<'a> {
Ok(ColumnDef { Ok(ColumnDef {
name, name,
data_type, data_type,
collation,
options, options,
}) })
} }
@ -6956,6 +6946,10 @@ impl<'a> Parser<'a> {
Ok(Some(ColumnOption::CharacterSet( Ok(Some(ColumnOption::CharacterSet(
self.parse_object_name(false)?, self.parse_object_name(false)?,
))) )))
} else if self.parse_keywords(&[Keyword::COLLATE]) {
Ok(Some(ColumnOption::Collation(
self.parse_object_name(false)?,
)))
} else if self.parse_keywords(&[Keyword::NOT, Keyword::NULL]) { } else if self.parse_keywords(&[Keyword::NOT, Keyword::NULL]) {
Ok(Some(ColumnOption::NotNull)) Ok(Some(ColumnOption::NotNull))
} else if self.parse_keywords(&[Keyword::COMMENT]) { } else if self.parse_keywords(&[Keyword::COMMENT]) {
@ -9047,7 +9041,6 @@ impl<'a> Parser<'a> {
Ok(ColumnDef { Ok(ColumnDef {
name, name,
data_type, data_type,
collation: None,
options: Vec::new(), // No constraints expected here options: Vec::new(), // No constraints expected here
}) })
} }

5
tests/sqlparser_bigquery.rs
View file

@ -389,7 +389,6 @@ fn parse_create_table_with_unquoted_hyphen() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("x"), name: Ident::new("x"),
data_type: DataType::Int64, data_type: DataType::Int64,
collation: None,
options: vec![] options: vec![]
},], },],
columns columns
@ -427,7 +426,6 @@ fn parse_create_table_with_options() {
ColumnDef { ColumnDef {
name: Ident::new("x"), name: Ident::new("x"),
data_type: DataType::Int64, data_type: DataType::Int64,
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -447,7 +445,6 @@ fn parse_create_table_with_options() {
ColumnDef { ColumnDef {
name: Ident::new("y"), name: Ident::new("y"),
data_type: DataType::Bool, data_type: DataType::Bool,
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Options(vec![SqlOption::KeyValue { option: ColumnOption::Options(vec![SqlOption::KeyValue {
@ -530,7 +527,6 @@ fn parse_nested_data_types() {
], ],
StructBracketKind::AngleBrackets StructBracketKind::AngleBrackets
), ),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -544,7 +540,6 @@ fn parse_nested_data_types() {
StructBracketKind::AngleBrackets StructBracketKind::AngleBrackets
), ),
))), ))),
collation: None,
options: vec![], options: vec![],
}, },
] ]

12
tests/sqlparser_clickhouse.rs
View file

@ -528,7 +528,6 @@ fn column_def(name: Ident, data_type: DataType) -> ColumnDef {
ColumnDef { ColumnDef {
name, name,
data_type, data_type,
collation: None,
options: vec![], options: vec![],
} }
} }
@ -617,7 +616,6 @@ fn parse_create_table_with_nullable() {
ColumnDef { ColumnDef {
name: "d".into(), name: "d".into(),
data_type: DataType::Date32, data_type: DataType::Date32,
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Null option: ColumnOption::Null
@ -661,7 +659,6 @@ fn parse_create_table_with_nested_data_types() {
DataType::LowCardinality(Box::new(DataType::String(None))) DataType::LowCardinality(Box::new(DataType::String(None)))
) )
]), ]),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -678,7 +675,6 @@ fn parse_create_table_with_nested_data_types() {
} }
]) ])
))), ))),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -695,7 +691,6 @@ fn parse_create_table_with_nested_data_types() {
)) ))
}, },
]), ]),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -704,7 +699,6 @@ fn parse_create_table_with_nested_data_types() {
Box::new(DataType::String(None)), Box::new(DataType::String(None)),
Box::new(DataType::UInt16) Box::new(DataType::UInt16)
), ),
collation: None,
options: vec![], options: vec![],
}, },
] ]
@ -736,13 +730,11 @@ fn parse_create_table_with_primary_key() {
ColumnDef { ColumnDef {
name: Ident::with_quote('`', "i"), name: Ident::with_quote('`', "i"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::with_quote('`', "k"), name: Ident::with_quote('`', "k"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
], ],
@ -814,7 +806,6 @@ fn parse_create_table_with_variant_default_expressions() {
ColumnDef { ColumnDef {
name: Ident::new("a"), name: Ident::new("a"),
data_type: DataType::Datetime(None), data_type: DataType::Datetime(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Materialized(Expr::Function(Function { option: ColumnOption::Materialized(Expr::Function(Function {
@ -836,7 +827,6 @@ fn parse_create_table_with_variant_default_expressions() {
ColumnDef { ColumnDef {
name: Ident::new("b"), name: Ident::new("b"),
data_type: DataType::Datetime(None), data_type: DataType::Datetime(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Ephemeral(Some(Expr::Function(Function { option: ColumnOption::Ephemeral(Some(Expr::Function(Function {
@ -858,7 +848,6 @@ fn parse_create_table_with_variant_default_expressions() {
ColumnDef { ColumnDef {
name: Ident::new("c"), name: Ident::new("c"),
data_type: DataType::Datetime(None), data_type: DataType::Datetime(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Ephemeral(None) option: ColumnOption::Ephemeral(None)
@ -867,7 +856,6 @@ fn parse_create_table_with_variant_default_expressions() {
ColumnDef { ColumnDef {
name: Ident::new("d"), name: Ident::new("d"),
data_type: DataType::String(None), data_type: DataType::String(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Alias(Expr::Function(Function { option: ColumnOption::Alias(Expr::Function(Function {

29
tests/sqlparser_common.rs
View file

@ -3426,7 +3426,6 @@ fn parse_create_table() {
length: 100, length: 100,
unit: None, unit: None,
})), })),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -3435,7 +3434,6 @@ fn parse_create_table() {
ColumnDef { ColumnDef {
name: "lat".into(), name: "lat".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Null, option: ColumnOption::Null,
@ -3444,13 +3442,11 @@ fn parse_create_table() {
ColumnDef { ColumnDef {
name: "lng".into(), name: "lng".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "constrained".into(), name: "constrained".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -3483,7 +3479,6 @@ fn parse_create_table() {
ColumnDef { ColumnDef {
name: "ref".into(), name: "ref".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::ForeignKey { option: ColumnOption::ForeignKey {
@ -3498,7 +3493,6 @@ fn parse_create_table() {
ColumnDef { ColumnDef {
name: "ref2".into(), name: "ref2".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::ForeignKey { option: ColumnOption::ForeignKey {
@ -3615,7 +3609,6 @@ fn parse_create_table_with_constraint_characteristics() {
length: 100, length: 100,
unit: None, unit: None,
})), })),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -3624,7 +3617,6 @@ fn parse_create_table_with_constraint_characteristics() {
ColumnDef { ColumnDef {
name: "lat".into(), name: "lat".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Null, option: ColumnOption::Null,
@ -3633,7 +3625,6 @@ fn parse_create_table_with_constraint_characteristics() {
ColumnDef { ColumnDef {
name: "lng".into(), name: "lng".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![], options: vec![],
}, },
] ]
@ -3768,7 +3759,6 @@ fn parse_create_table_column_constraint_characteristics() {
vec![ColumnDef { vec![ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Unique { option: ColumnOption::Unique {
@ -3883,13 +3873,11 @@ fn parse_create_table_hive_array() {
ColumnDef { ColumnDef {
name: Ident::new("name"), name: Ident::new("name"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("val"), name: Ident::new("val"),
data_type: DataType::Array(expected), data_type: DataType::Array(expected),
collation: None,
options: vec![], options: vec![],
}, },
], ],
@ -4255,7 +4243,6 @@ fn parse_create_external_table() {
length: 100, length: 100,
unit: None, unit: None,
})), })),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -4264,7 +4251,6 @@ fn parse_create_external_table() {
ColumnDef { ColumnDef {
name: "lat".into(), name: "lat".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Null, option: ColumnOption::Null,
@ -4273,7 +4259,6 @@ fn parse_create_external_table() {
ColumnDef { ColumnDef {
name: "lng".into(), name: "lng".into(),
data_type: DataType::Double(ExactNumberInfo::None), data_type: DataType::Double(ExactNumberInfo::None),
collation: None,
options: vec![], options: vec![],
}, },
] ]
@ -4326,7 +4311,6 @@ fn parse_create_or_replace_external_table() {
length: 100, length: 100,
unit: None, unit: None,
})), })),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -10818,7 +10802,14 @@ fn parse_execute_immediate() {
#[test] #[test]
fn parse_create_table_collate() { fn parse_create_table_collate() {
pg_and_generic().verified_stmt("CREATE TABLE tbl (foo INT, bar TEXT COLLATE \"de_DE\")"); all_dialects().verified_stmt("CREATE TABLE tbl (foo INT, bar TEXT COLLATE \"de_DE\")");
// check ordering is preserved
all_dialects().verified_stmt(
"CREATE TABLE tbl (foo INT, bar TEXT CHARACTER SET utf8mb4 COLLATE \"de_DE\")",
);
all_dialects().verified_stmt(
"CREATE TABLE tbl (foo INT, bar TEXT COLLATE \"de_DE\" CHARACTER SET utf8mb4)",
);
} }
#[test] #[test]
@ -10997,7 +10988,6 @@ fn test_parse_inline_comment() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("id".to_string()), name: Ident::new("id".to_string()),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: Comment("comment without equal".to_string()), option: Comment("comment without equal".to_string()),
@ -13584,7 +13574,6 @@ fn parse_create_table_with_enum_types() {
], ],
Some(8) Some(8)
), ),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -13602,7 +13591,6 @@ fn parse_create_table_with_enum_types() {
], ],
Some(16) Some(16)
), ),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -13614,7 +13602,6 @@ fn parse_create_table_with_enum_types() {
], ],
None None
), ),
collation: None,
options: vec![], options: vec![],
} }
], ],

6
tests/sqlparser_duckdb.rs
View file

@ -60,7 +60,6 @@ fn test_struct() {
vec![ColumnDef { vec![ColumnDef {
name: "s".into(), name: "s".into(),
data_type: struct_type1.clone(), data_type: struct_type1.clone(),
collation: None,
options: vec![], options: vec![],
}] }]
); );
@ -75,7 +74,6 @@ fn test_struct() {
Box::new(struct_type1), Box::new(struct_type1),
None None
)), )),
collation: None,
options: vec![], options: vec![],
}] }]
); );
@ -120,7 +118,6 @@ fn test_struct() {
Box::new(struct_type2), Box::new(struct_type2),
None None
)), )),
collation: None,
options: vec![], options: vec![],
}] }]
); );
@ -671,7 +668,6 @@ fn test_duckdb_union_datatype() {
field_name: "a".into(), field_name: "a".into(),
field_type: DataType::Int(None) field_type: DataType::Int(None)
}]), }]),
collation: Default::default(),
options: Default::default() options: Default::default()
}, },
ColumnDef { ColumnDef {
@ -686,7 +682,6 @@ fn test_duckdb_union_datatype() {
field_type: DataType::Int(None) field_type: DataType::Int(None)
} }
]), ]),
collation: Default::default(),
options: Default::default() options: Default::default()
}, },
ColumnDef { ColumnDef {
@ -698,7 +693,6 @@ fn test_duckdb_union_datatype() {
field_type: DataType::Int(None) field_type: DataType::Int(None)
}]) }])
}]), }]),
collation: Default::default(),
options: Default::default() options: Default::default()
} }
], ],

11
tests/sqlparser_mssql.rs
View file

@ -1496,7 +1496,6 @@ fn parse_create_table_with_valid_options() {
span: Span::empty(), span: Span::empty(),
}, },
data_type: Int(None,), data_type: Int(None,),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -1506,7 +1505,7 @@ fn parse_create_table_with_valid_options() {
span: Span::empty(), span: Span::empty(),
}, },
data_type: Int(None,), data_type: Int(None,),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -1516,7 +1515,7 @@ fn parse_create_table_with_valid_options() {
span: Span::empty(), span: Span::empty(),
}, },
data_type: Int(None,), data_type: Int(None,),
collation: None,
options: vec![], options: vec![],
}, },
], ],
@ -1671,7 +1670,7 @@ fn parse_create_table_with_identity_column() {
span: Span::empty(), span: Span::empty(),
}, },
data_type: Int(None,), data_type: Int(None,),
collation: None,
options: column_options, options: column_options,
},], },],
constraints: vec![], constraints: vec![],
@ -1815,7 +1814,7 @@ fn parse_mssql_varbinary_max_length() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("var_binary_col"), name: Ident::new("var_binary_col"),
data_type: Varbinary(Some(BinaryLength::Max)), data_type: Varbinary(Some(BinaryLength::Max)),
collation: None,
options: vec![] options: vec![]
},], },],
); );
@ -1840,7 +1839,7 @@ fn parse_mssql_varbinary_max_length() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("var_binary_col"), name: Ident::new("var_binary_col"),
data_type: Varbinary(Some(BinaryLength::IntegerLength { length: 50 })), data_type: Varbinary(Some(BinaryLength::IntegerLength { length: 50 })),
collation: None,
options: vec![] options: vec![]
},], },],
); );

48
tests/sqlparser_mysql.rs
View file

@ -636,7 +636,6 @@ fn parse_create_table_auto_increment() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("bar"), name: Ident::new("bar"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -726,7 +725,6 @@ fn parse_create_table_primary_and_unique_key() {
ColumnDef { ColumnDef {
name: Ident::new("id"), name: Ident::new("id"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -746,7 +744,6 @@ fn parse_create_table_primary_and_unique_key() {
ColumnDef { ColumnDef {
name: Ident::new("bar"), name: Ident::new("bar"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -896,7 +893,6 @@ fn parse_create_table_set_enum() {
ColumnDef { ColumnDef {
name: Ident::new("bar"), name: Ident::new("bar"),
data_type: DataType::Set(vec!["a".to_string(), "b".to_string()]), data_type: DataType::Set(vec!["a".to_string(), "b".to_string()]),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
@ -908,7 +904,6 @@ fn parse_create_table_set_enum() {
], ],
None None
), ),
collation: None,
options: vec![], options: vec![],
} }
], ],
@ -935,7 +930,6 @@ fn parse_create_table_engine_default_charset() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("id"), name: Ident::new("id"),
data_type: DataType::Int(Some(11)), data_type: DataType::Int(Some(11)),
collation: None,
options: vec![], options: vec![],
},], },],
columns columns
@ -968,7 +962,6 @@ fn parse_create_table_collate() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("id"), name: Ident::new("id"),
data_type: DataType::Int(Some(11)), data_type: DataType::Int(Some(11)),
collation: None,
options: vec![], options: vec![],
},], },],
columns columns
@ -1016,7 +1009,6 @@ fn parse_create_table_comment_character_set() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("s"), name: Ident::new("s"),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -1063,7 +1055,6 @@ fn parse_quote_identifiers() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::with_quote('`', "BEGIN"), name: Ident::with_quote('`', "BEGIN"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Unique { option: ColumnOption::Unique {
@ -1326,31 +1317,26 @@ fn parse_create_table_with_minimum_display_width() {
ColumnDef { ColumnDef {
name: Ident::new("bar_tinyint"), name: Ident::new("bar_tinyint"),
data_type: DataType::TinyInt(Some(3)), data_type: DataType::TinyInt(Some(3)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_smallint"), name: Ident::new("bar_smallint"),
data_type: DataType::SmallInt(Some(5)), data_type: DataType::SmallInt(Some(5)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_mediumint"), name: Ident::new("bar_mediumint"),
data_type: DataType::MediumInt(Some(6)), data_type: DataType::MediumInt(Some(6)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_int"), name: Ident::new("bar_int"),
data_type: DataType::Int(Some(11)), data_type: DataType::Int(Some(11)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_bigint"), name: Ident::new("bar_bigint"),
data_type: DataType::BigInt(Some(20)), data_type: DataType::BigInt(Some(20)),
collation: None,
options: vec![], options: vec![],
} }
], ],
@ -1372,31 +1358,26 @@ fn parse_create_table_unsigned() {
ColumnDef { ColumnDef {
name: Ident::new("bar_tinyint"), name: Ident::new("bar_tinyint"),
data_type: DataType::UnsignedTinyInt(Some(3)), data_type: DataType::UnsignedTinyInt(Some(3)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_smallint"), name: Ident::new("bar_smallint"),
data_type: DataType::UnsignedSmallInt(Some(5)), data_type: DataType::UnsignedSmallInt(Some(5)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_mediumint"), name: Ident::new("bar_mediumint"),
data_type: DataType::UnsignedMediumInt(Some(13)), data_type: DataType::UnsignedMediumInt(Some(13)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_int"), name: Ident::new("bar_int"),
data_type: DataType::UnsignedInt(Some(11)), data_type: DataType::UnsignedInt(Some(11)),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::new("bar_bigint"), name: Ident::new("bar_bigint"),
data_type: DataType::UnsignedBigInt(Some(20)), data_type: DataType::UnsignedBigInt(Some(20)),
collation: None,
options: vec![], options: vec![],
}, },
], ],
@ -2159,7 +2140,6 @@ fn parse_alter_table_add_column() {
column_def: ColumnDef { column_def: ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
column_position: Some(MySQLColumnPosition::First), column_position: Some(MySQLColumnPosition::First),
@ -2189,7 +2169,6 @@ fn parse_alter_table_add_column() {
column_def: ColumnDef { column_def: ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
column_position: Some(MySQLColumnPosition::After(Ident { column_position: Some(MySQLColumnPosition::After(Ident {
@ -2229,7 +2208,6 @@ fn parse_alter_table_add_columns() {
column_def: ColumnDef { column_def: ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![], options: vec![],
}, },
column_position: Some(MySQLColumnPosition::First), column_position: Some(MySQLColumnPosition::First),
@ -2240,7 +2218,6 @@ fn parse_alter_table_add_columns() {
column_def: ColumnDef { column_def: ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
column_position: Some(MySQLColumnPosition::After(Ident { column_position: Some(MySQLColumnPosition::After(Ident {
@ -2593,7 +2570,6 @@ fn parse_table_column_option_on_update() {
vec![ColumnDef { vec![ColumnDef {
name: Ident::with_quote('`', "modification_time"), name: Ident::with_quote('`', "modification_time"),
data_type: DataType::Datetime(None), data_type: DataType::Datetime(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::OnUpdate(call("CURRENT_TIMESTAMP", [])), option: ColumnOption::OnUpdate(call("CURRENT_TIMESTAMP", [])),
@ -2878,21 +2854,27 @@ fn parse_convert_using() {
#[test] #[test]
fn parse_create_table_with_column_collate() { fn parse_create_table_with_column_collate() {
let sql = "CREATE TABLE tb (id TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci)"; let sql = "CREATE TABLE tb (id TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci)";
let canonical = "CREATE TABLE tb (id TEXT COLLATE utf8mb4_0900_ai_ci CHARACTER SET utf8mb4)"; match mysql().verified_stmt(sql) {
match mysql().one_statement_parses_to(sql, canonical) {
Statement::CreateTable(CreateTable { name, columns, .. }) => { Statement::CreateTable(CreateTable { name, columns, .. }) => {
assert_eq!(name.to_string(), "tb"); assert_eq!(name.to_string(), "tb");
assert_eq!( assert_eq!(
vec![ColumnDef { vec![ColumnDef {
name: Ident::new("id"), name: Ident::new("id"),
data_type: DataType::Text, data_type: DataType::Text,
collation: Some(ObjectName::from(vec![Ident::new("utf8mb4_0900_ai_ci")])), options: vec![
options: vec![ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new( option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new(
"utf8mb4" "utf8mb4"
)])) )]))
}], },
ColumnOptionDef {
name: None,
option: ColumnOption::Collation(ObjectName::from(vec![Ident::new(
"utf8mb4_0900_ai_ci"
)]))
}
],
},], },],
columns columns
); );

42
tests/sqlparser_postgres.rs
View file

@ -363,7 +363,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "customer_id".into(), name: "customer_id".into(),
data_type: DataType::Integer(None), data_type: DataType::Integer(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Default( option: ColumnOption::Default(
@ -374,7 +373,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "store_id".into(), name: "store_id".into(),
data_type: DataType::SmallInt(None), data_type: DataType::SmallInt(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -388,7 +386,6 @@ fn parse_create_table_with_defaults() {
unit: None unit: None
} }
)), )),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::NotNull,
@ -402,11 +399,18 @@ fn parse_create_table_with_defaults() {
unit: None unit: None
} }
)), )),
collation: Some(ObjectName::from(vec![Ident::with_quote('"', "es_ES")])), options: vec![
options: vec![ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull, option: ColumnOption::Collation(ObjectName::from(vec![
}], Ident::with_quote('"', "es_ES")
])),
},
ColumnOptionDef {
name: None,
option: ColumnOption::NotNull,
}
],
}, },
ColumnDef { ColumnDef {
name: "email".into(), name: "email".into(),
@ -416,13 +420,11 @@ fn parse_create_table_with_defaults() {
unit: None unit: None
} }
)), )),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "address_id".into(), name: "address_id".into(),
data_type: DataType::SmallInt(None), data_type: DataType::SmallInt(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull option: ColumnOption::NotNull
@ -431,7 +433,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "activebool".into(), name: "activebool".into(),
data_type: DataType::Boolean, data_type: DataType::Boolean,
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -446,7 +447,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "create_date".into(), name: "create_date".into(),
data_type: DataType::Date, data_type: DataType::Date,
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -461,7 +461,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "last_update".into(), name: "last_update".into(),
data_type: DataType::Timestamp(None, TimezoneInfo::WithoutTimeZone), data_type: DataType::Timestamp(None, TimezoneInfo::WithoutTimeZone),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -476,7 +475,6 @@ fn parse_create_table_with_defaults() {
ColumnDef { ColumnDef {
name: "active".into(), name: "active".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::NotNull option: ColumnOption::NotNull
@ -842,7 +840,6 @@ fn parse_alter_table_add_columns() {
column_def: ColumnDef { column_def: ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![], options: vec![],
}, },
column_position: None, column_position: None,
@ -853,7 +850,6 @@ fn parse_alter_table_add_columns() {
column_def: ColumnDef { column_def: ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
column_position: None, column_position: None,
@ -4291,37 +4287,31 @@ fn parse_create_table_with_alias() {
ColumnDef { ColumnDef {
name: "int8_col".into(), name: "int8_col".into(),
data_type: DataType::Int8(None), data_type: DataType::Int8(None),
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "int4_col".into(), name: "int4_col".into(),
data_type: DataType::Int4(None), data_type: DataType::Int4(None),
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "int2_col".into(), name: "int2_col".into(),
data_type: DataType::Int2(None), data_type: DataType::Int2(None),
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "float8_col".into(), name: "float8_col".into(),
data_type: DataType::Float8, data_type: DataType::Float8,
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "float4_col".into(), name: "float4_col".into(),
data_type: DataType::Float4, data_type: DataType::Float4,
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "bool_col".into(), name: "bool_col".into(),
data_type: DataType::Bool, data_type: DataType::Bool,
collation: None,
options: vec![] options: vec![]
}, },
] ]
@ -4343,13 +4333,11 @@ fn parse_create_table_with_partition_by() {
ColumnDef { ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![] options: vec![]
}, },
ColumnDef { ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![] options: vec![]
} }
], ],
@ -5093,25 +5081,21 @@ fn parse_trigger_related_functions() {
ColumnDef { ColumnDef {
name: "empname".into(), name: "empname".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "salary".into(), name: "salary".into(),
data_type: DataType::Integer(None), data_type: DataType::Integer(None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "last_date".into(), name: "last_date".into(),
data_type: DataType::Timestamp(None, TimezoneInfo::None), data_type: DataType::Timestamp(None, TimezoneInfo::None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "last_user".into(), name: "last_user".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: None,
options: vec![], options: vec![],
}, },
], ],
@ -5445,13 +5429,11 @@ fn parse_varbit_datatype() {
ColumnDef { ColumnDef {
name: "x".into(), name: "x".into(),
data_type: DataType::VarBit(None), data_type: DataType::VarBit(None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: "y".into(), name: "y".into(),
data_type: DataType::VarBit(Some(42)), data_type: DataType::VarBit(Some(42)),
collation: None,
options: vec![], options: vec![],
} }
] ]

24
tests/sqlparser_snowflake.rs
View file

@ -346,7 +346,6 @@ fn test_snowflake_create_table_column_comment() {
name: None, name: None,
option: ColumnOption::Comment("some comment".to_string()) option: ColumnOption::Comment("some comment".to_string())
}], }],
collation: None
}], }],
columns columns
) )
@ -553,7 +552,6 @@ fn test_snowflake_create_table_with_autoincrement_columns() {
ColumnDef { ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Identity(IdentityPropertyKind::Autoincrement( option: ColumnOption::Identity(IdentityPropertyKind::Autoincrement(
@ -567,7 +565,6 @@ fn test_snowflake_create_table_with_autoincrement_columns() {
ColumnDef { ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Identity(IdentityPropertyKind::Autoincrement( option: ColumnOption::Identity(IdentityPropertyKind::Autoincrement(
@ -586,7 +583,6 @@ fn test_snowflake_create_table_with_autoincrement_columns() {
ColumnDef { ColumnDef {
name: "c".into(), name: "c".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Identity(IdentityPropertyKind::Identity( option: ColumnOption::Identity(IdentityPropertyKind::Identity(
@ -600,7 +596,6 @@ fn test_snowflake_create_table_with_autoincrement_columns() {
ColumnDef { ColumnDef {
name: "d".into(), name: "d".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Identity(IdentityPropertyKind::Identity( option: ColumnOption::Identity(IdentityPropertyKind::Identity(
@ -634,8 +629,12 @@ fn test_snowflake_create_table_with_collated_column() {
vec![ColumnDef { vec![ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: Some(ObjectName::from(vec![Ident::with_quote('\'', "de_DE")])), options: vec![ColumnOptionDef {
options: vec![] name: None,
option: ColumnOption::Collation(ObjectName::from(vec![Ident::with_quote(
'\'', "de_DE"
)])),
}]
},] },]
); );
} }
@ -674,7 +673,6 @@ fn test_snowflake_create_table_with_columns_masking_policy() {
vec![ColumnDef { vec![ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy( option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy(
@ -709,7 +707,6 @@ fn test_snowflake_create_table_with_columns_projection_policy() {
vec![ColumnDef { vec![ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy( option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy(
@ -747,7 +744,6 @@ fn test_snowflake_create_table_with_columns_tags() {
vec![ColumnDef { vec![ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ColumnOptionDef { options: vec![ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Tags(TagsColumnOption { option: ColumnOption::Tags(TagsColumnOption {
@ -782,7 +778,6 @@ fn test_snowflake_create_table_with_several_column_options() {
ColumnDef { ColumnDef {
name: "a".into(), name: "a".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -818,8 +813,13 @@ fn test_snowflake_create_table_with_several_column_options() {
ColumnDef { ColumnDef {
name: "b".into(), name: "b".into(),
data_type: DataType::Text, data_type: DataType::Text,
collation: Some(ObjectName::from(vec![Ident::with_quote('\'', "de_DE")])),
options: vec![ options: vec![
ColumnOptionDef {
name: None,
option: ColumnOption::Collation(ObjectName::from(vec![
Ident::with_quote('\'', "de_DE")
])),
},
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy( option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy(

4
tests/sqlparser_sqlite.rs
View file

@ -214,7 +214,6 @@ fn parse_create_table_auto_increment() {
vec![ColumnDef { vec![ColumnDef {
name: "bar".into(), name: "bar".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -243,7 +242,6 @@ fn parse_create_table_primary_key_asc_desc() {
let expected_column_def = |kind| ColumnDef { let expected_column_def = |kind| ColumnDef {
name: "bar".into(), name: "bar".into(),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![ options: vec![
ColumnOptionDef { ColumnOptionDef {
name: None, name: None,
@ -286,13 +284,11 @@ fn parse_create_sqlite_quote() {
ColumnDef { ColumnDef {
name: Ident::with_quote('"', "KEY"), name: Ident::with_quote('"', "KEY"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
ColumnDef { ColumnDef {
name: Ident::with_quote('[', "INDEX"), name: Ident::with_quote('[', "INDEX"),
data_type: DataType::Int(None), data_type: DataType::Int(None),
collation: None,
options: vec![], options: vec![],
}, },
], ],