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

Change tag and policy names to ObjectName (#1892)

Browse source
This commit is contained in:
Elia Perantoni 2025-07-04 18:21:31 +02:00 • committed by GitHub
parent 239e30a97c
commit 942d747d89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ast/ddl.rs
View file

@ -1709,7 +1709,7 @@ pub struct ColumnPolicyProperty {
/// ``` /// ```
/// [Snowflake]: https://docs.snowflake.com/en/sql-reference/sql/create-table /// [Snowflake]: https://docs.snowflake.com/en/sql-reference/sql/create-table
pub with: bool, pub with: bool,
pub policy_name: Ident, pub policy_name: ObjectName,
pub using_columns: Option<Vec<Ident>>, pub using_columns: Option<Vec<Ident>>,
} }

4
src/ast/mod.rs
View file

@ -9372,12 +9372,12 @@ impl Display for RowAccessPolicy {
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))] #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
pub struct Tag { pub struct Tag {
pub key: Ident, pub key: ObjectName,
pub value: String, pub value: String,
} }
impl Tag { impl Tag {
pub fn new(key: Ident, value: String) -> Self { pub fn new(key: ObjectName, value: String) -> Self {
Self { key, value } Self { key, value }
} }
} }

2
src/dialect/snowflake.rs
View file

@ -1189,7 +1189,7 @@ fn parse_column_policy_property(
parser: &mut Parser, parser: &mut Parser,
with: bool, with: bool,
) -> Result<ColumnPolicyProperty, ParserError> { ) -> Result<ColumnPolicyProperty, ParserError> {
let policy_name = parser.parse_identifier()?; let policy_name = parser.parse_object_name(false)?;
let using_columns = if parser.parse_keyword(Keyword::USING) { let using_columns = if parser.parse_keyword(Keyword::USING) {
parser.expect_token(&Token::LParen)?; parser.expect_token(&Token::LParen)?;
let columns = parser.parse_comma_separated(|p| p.parse_identifier())?; let columns = parser.parse_comma_separated(|p| p.parse_identifier())?;

2
src/parser/mod.rs
View file

@ -7884,7 +7884,7 @@ impl<'a> Parser<'a> {
} }
pub(crate) fn parse_tag(&mut self) -> Result<Tag, ParserError> { pub(crate) fn parse_tag(&mut self) -> Result<Tag, ParserError> {
let name = self.parse_identifier()?; let name = self.parse_object_name(false)?;
self.expect_token(&Token::Eq)?; self.expect_token(&Token::Eq)?;
let value = self.parse_literal_string()?; let value = self.parse_literal_string()?;

64
tests/sqlparser_snowflake.rs
View file

@ -270,8 +270,8 @@ fn test_snowflake_create_table_with_tag() {
assert_eq!("my_table", name.to_string()); assert_eq!("my_table", name.to_string());
assert_eq!( assert_eq!(
Some(vec![ Some(vec![
Tag::new("A".into(), "TAG A".to_string()), Tag::new(ObjectName::from(vec![Ident::new("A")]), "TAG A".to_string()),
Tag::new("B".into(), "TAG B".to_string()) Tag::new(ObjectName::from(vec![Ident::new("B")]), "TAG B".to_string())
]), ]),
with_tags with_tags
); );
@ -291,8 +291,8 @@ fn test_snowflake_create_table_with_tag() {
assert_eq!("my_table", name.to_string()); assert_eq!("my_table", name.to_string());
assert_eq!( assert_eq!(
Some(vec![ Some(vec![
Tag::new("A".into(), "TAG A".to_string()), Tag::new(ObjectName::from(vec![Ident::new("A")]), "TAG A".to_string()),
Tag::new("B".into(), "TAG B".to_string()) Tag::new(ObjectName::from(vec![Ident::new("B")]), "TAG B".to_string())
]), ]),
with_tags with_tags
); );
@ -731,7 +731,7 @@ fn test_snowflake_create_table_with_columns_masking_policy() {
option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy( option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy(
ColumnPolicyProperty { ColumnPolicyProperty {
with, with,
policy_name: "p".into(), policy_name: ObjectName::from(vec![Ident::new("p")]),
using_columns, using_columns,
} }
)) ))
@ -765,7 +765,7 @@ fn test_snowflake_create_table_with_columns_projection_policy() {
option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy( option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy(
ColumnPolicyProperty { ColumnPolicyProperty {
with, with,
policy_name: "p".into(), policy_name: ObjectName::from(vec![Ident::new("p")]),
using_columns: None, using_columns: None,
} }
)) ))
@ -802,8 +802,14 @@ fn test_snowflake_create_table_with_columns_tags() {
option: ColumnOption::Tags(TagsColumnOption { option: ColumnOption::Tags(TagsColumnOption {
with, with,
tags: vec![ tags: vec![
Tag::new("A".into(), "TAG A".into()), Tag::new(
Tag::new("B".into(), "TAG B".into()), ObjectName::from(vec![Ident::new("A")]),
"TAG A".into()
),
Tag::new(
ObjectName::from(vec![Ident::new("B")]),
"TAG B".into()
),
] ]
}), }),
}], }],
@ -846,7 +852,7 @@ fn test_snowflake_create_table_with_several_column_options() {
option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy( option: ColumnOption::Policy(ColumnPolicy::MaskingPolicy(
ColumnPolicyProperty { ColumnPolicyProperty {
with: true, with: true,
policy_name: "p1".into(), policy_name: ObjectName::from(vec![Ident::new("p1")]),
using_columns: Some(vec!["a".into(), "b".into()]), using_columns: Some(vec!["a".into(), "b".into()]),
} }
)), )),
@ -856,8 +862,14 @@ fn test_snowflake_create_table_with_several_column_options() {
option: ColumnOption::Tags(TagsColumnOption { option: ColumnOption::Tags(TagsColumnOption {
with: true, with: true,
tags: vec![ tags: vec![
Tag::new("A".into(), "TAG A".into()), Tag::new(
Tag::new("B".into(), "TAG B".into()), ObjectName::from(vec![Ident::new("A")]),
"TAG A".into()
),
Tag::new(
ObjectName::from(vec![Ident::new("B")]),
"TAG B".into()
),
] ]
}), }),
} }
@ -878,7 +890,7 @@ fn test_snowflake_create_table_with_several_column_options() {
option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy( option: ColumnOption::Policy(ColumnPolicy::ProjectionPolicy(
ColumnPolicyProperty { ColumnPolicyProperty {
with: false, with: false,
policy_name: "p2".into(), policy_name: ObjectName::from(vec![Ident::new("p2")]),
using_columns: None, using_columns: None,
} }
)), )),
@ -888,8 +900,14 @@ fn test_snowflake_create_table_with_several_column_options() {
option: ColumnOption::Tags(TagsColumnOption { option: ColumnOption::Tags(TagsColumnOption {
with: false, with: false,
tags: vec![ tags: vec![
Tag::new("C".into(), "TAG C".into()), Tag::new(
Tag::new("D".into(), "TAG D".into()), ObjectName::from(vec![Ident::new("C")]),
"TAG C".into()
),
Tag::new(
ObjectName::from(vec![Ident::new("D")]),
"TAG D".into()
),
] ]
}), }),
} }
@ -942,8 +960,8 @@ fn test_snowflake_create_iceberg_table_all_options() {
with_aggregation_policy.map(|name| name.to_string()) with_aggregation_policy.map(|name| name.to_string())
); );
assert_eq!(Some(vec![ assert_eq!(Some(vec![
Tag::new("A".into(), "TAG A".into()), Tag::new(ObjectName::from(vec![Ident::new("A")]), "TAG A".into()),
Tag::new("B".into(), "TAG B".into()), Tag::new(ObjectName::from(vec![Ident::new("B")]), "TAG B".into()),
]), with_tags); ]), with_tags);
} }
@ -4172,3 +4190,17 @@ fn test_snowflake_create_view_with_multiple_column_options() {
r#"CREATE VIEW X (COL WITH TAG (pii='email') COMMENT 'foobar') AS SELECT * FROM Y"#; r#"CREATE VIEW X (COL WITH TAG (pii='email') COMMENT 'foobar') AS SELECT * FROM Y"#;
snowflake().verified_stmt(create_view_with_tag); snowflake().verified_stmt(create_view_with_tag);
} }
#[test]
fn test_snowflake_create_view_with_composite_tag() {
let create_view_with_tag =
r#"CREATE VIEW X (COL WITH TAG (foo.bar.baz.pii='email')) AS SELECT * FROM Y"#;
snowflake().verified_stmt(create_view_with_tag);
}
#[test]
fn test_snowflake_create_view_with_composite_policy_name() {
let create_view_with_tag =
r#"CREATE VIEW X (COL WITH MASKING POLICY foo.bar.baz) AS SELECT * FROM Y"#;
snowflake().verified_stmt(create_view_with_tag);
}