Skip to content

Commit 82ae995

Browse files
ayman-sigmaayman-sigma
committed
fmt
1 parent 293effe commit 82ae995

File tree

10 files changed

+75
-21
lines changed

10 files changed

+75
-21
lines changed

‎src/parser/mod.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12600,7 +12600,9 @@ impl<'a> Parser<'a> {
1260012600
.parse_one_of_keywords(&[Keyword::FROM, Keyword::IN])
1260112601
.is_some()
1260212602
{
12603-
parent_name.0.insert(0, self.parse_identifier(false)?.to_object_name_part());
12603+
parent_name
12604+
.0
12605+
.insert(0, self.parse_identifier(false)?.to_object_name_part());
1260412606
}
1260512607
(None, Some(parent_name))
1260612608
}

‎tests/sqlparser_clickhouse.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,10 @@ fn parse_delimited_identifiers() {
173173
with_ordinality: _,
174174
partitions: _,
175175
} => {
176-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
176+
assert_eq!(
177+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
178+
name
179+
);
177180
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
178181
assert!(args.is_none());
179182
assert!(with_hints.is_empty());

‎tests/sqlparser_common.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,7 +2740,10 @@ fn parse_window_function_null_treatment_arg() {
27402740
let SelectItem::UnnamedExpr(Expr::Function(actual)) = &projection[i] else {
27412741
unreachable!()
27422742
};
2743-
assert_eq!(ObjectName::from(vec![Ident::new("FIRST_VALUE")]), actual.name);
2743+
assert_eq!(
2744+
ObjectName::from(vec![Ident::new("FIRST_VALUE")]),
2745+
actual.name
2746+
);
27442747
let FunctionArguments::List(arg_list) = &actual.args else {
27452748
panic!("expected argument list")
27462749
};
@@ -8202,7 +8205,10 @@ fn parse_merge() {
82028205
into: None,
82038206
from: vec![TableWithJoins {
82048207
relation: TableFactor::Table {
8205-
name: ObjectName::from(vec![Ident::new("s"), Ident::new("foo")]),
8208+
name: ObjectName::from(vec![
8209+
Ident::new("s"),
8210+
Ident::new("foo")
8211+
]),
82068212
alias: None,
82078213
args: None,
82088214
with_hints: vec![],

‎tests/sqlparser_databricks.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,15 @@ fn parse_use() {
257257
// Test single identifier with keyword and no quotes
258258
assert_eq!(
259259
databricks().verified_stmt("USE CATALOG my_catalog"),
260-
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new("my_catalog")])))
260+
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new(
261+
"my_catalog"
262+
)])))
261263
);
262264
assert_eq!(
263265
databricks().verified_stmt("USE DATABASE my_schema"),
264-
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new("my_schema")])))
266+
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new(
267+
"my_schema"
268+
)])))
265269
);
266270
assert_eq!(
267271
databricks().verified_stmt("USE SCHEMA my_schema"),

‎tests/sqlparser_hive.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,10 @@ fn parse_delimited_identifiers() {
458458
with_ordinality: _,
459459
partitions: _,
460460
} => {
461-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
461+
assert_eq!(
462+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
463+
name
464+
);
462465
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
463466
assert!(args.is_none());
464467
assert!(with_hints.is_empty());

‎tests/sqlparser_mssql.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,10 @@ fn parse_delimited_identifiers() {
680680
with_ordinality: _,
681681
partitions: _,
682682
} => {
683-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
683+
assert_eq!(
684+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
685+
name
686+
);
684687
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
685688
assert!(args.is_none());
686689
assert!(with_hints.is_empty());

‎tests/sqlparser_mysql.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,10 @@ fn parse_show_columns() {
250250
show_in: Some(ShowStatementIn {
251251
clause: ShowStatementInClause::FROM,
252252
parent_type: None,
253-
parent_name: Some(ObjectName::from(vec![Ident::new("mydb"), Ident::new("mytable")])),
253+
parent_name: Some(ObjectName::from(vec![
254+
Ident::new("mydb"),
255+
Ident::new("mytable")
256+
])),
254257
}),
255258
filter_position: None,
256259
limit_from: None,
@@ -2828,7 +2831,9 @@ fn parse_create_table_with_column_collate() {
28282831
collation: Some(ObjectName::from(vec![Ident::new("utf8mb4_0900_ai_ci")])),
28292832
options: vec![ColumnOptionDef {
28302833
name: None,
2831-
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new("utf8mb4")]))
2834+
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new(
2835+
"utf8mb4"
2836+
)]))
28322837
}],
28332838
},],
28342839
columns

‎tests/sqlparser_postgres.rs‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,9 @@ fn parse_pg_on_conflict() {
16741674
assert_eq!(
16751675
OnConflictAction::DoUpdate(DoUpdate {
16761676
assignments: vec![Assignment {
1677-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1677+
target: AssignmentTarget::ColumnName(ObjectName::from(
1678+
vec!["dname".into()]
1679+
)),
16781680
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "dname".into()])
16791681
},],
16801682
selection: None
@@ -1705,14 +1707,18 @@ fn parse_pg_on_conflict() {
17051707
OnConflictAction::DoUpdate(DoUpdate {
17061708
assignments: vec![
17071709
Assignment {
1708-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1710+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1711+
"dname".into()
1712+
])),
17091713
value: Expr::CompoundIdentifier(vec![
17101714
"EXCLUDED".into(),
17111715
"dname".into()
17121716
])
17131717
},
17141718
Assignment {
1715-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["area".into()])),
1719+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1720+
"area".into()
1721+
])),
17161722
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "area".into()])
17171723
},
17181724
],
@@ -1762,7 +1768,9 @@ fn parse_pg_on_conflict() {
17621768
assert_eq!(
17631769
OnConflictAction::DoUpdate(DoUpdate {
17641770
assignments: vec![Assignment {
1765-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1771+
target: AssignmentTarget::ColumnName(ObjectName::from(
1772+
vec!["dname".into()]
1773+
)),
17661774
value: Expr::Value(Value::Placeholder("$1".to_string()))
17671775
},],
17681776
selection: Some(Expr::BinaryOp {
@@ -1795,11 +1803,16 @@ fn parse_pg_on_conflict() {
17951803
})),
17961804
..
17971805
}) => {
1798-
assert_eq!(ObjectName::from(vec![Ident::from("distributors_did_pkey")]), cname);
1806+
assert_eq!(
1807+
ObjectName::from(vec![Ident::from("distributors_did_pkey")]),
1808+
cname
1809+
);
17991810
assert_eq!(
18001811
OnConflictAction::DoUpdate(DoUpdate {
18011812
assignments: vec![Assignment {
1802-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1813+
target: AssignmentTarget::ColumnName(ObjectName::from(
1814+
vec!["dname".into()]
1815+
)),
18031816
value: Expr::Value(Value::Placeholder("$1".to_string()))
18041817
},],
18051818
selection: Some(Expr::BinaryOp {
@@ -2822,7 +2835,10 @@ fn parse_json_table_is_not_reserved() {
28222835
TableFactor::Table {
28232836
name: ObjectName(name),
28242837
..
2825-
} => assert_eq!(ObjectNamePart::Identifier(Ident::new("JSON_TABLE")), name[0]),
2838+
} => assert_eq!(
2839+
ObjectNamePart::Identifier(Ident::new("JSON_TABLE")),
2840+
name[0]
2841+
),
28262842
other => panic!("Expected: JSON_TABLE to be parsed as a table name, but got {other:?}"),
28272843
}
28282844
}
@@ -3512,7 +3528,10 @@ fn parse_delimited_identifiers() {
35123528
with_ordinality: _,
35133529
partitions: _,
35143530
} => {
3515-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
3531+
assert_eq!(
3532+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
3533+
name
3534+
);
35163535
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
35173536
assert!(args.is_none());
35183537
assert!(with_hints.is_empty());

‎tests/sqlparser_redshift.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ fn parse_delimited_identifiers() {
124124
with_ordinality: _,
125125
partitions: _,
126126
} => {
127-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
127+
assert_eq!(
128+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
129+
name
130+
);
128131
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
129132
assert!(args.is_none());
130133
assert!(with_hints.is_empty());

‎tests/sqlparser_snowflake.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,10 @@ fn parse_delimited_identifiers() {
11911191
with_ordinality: _,
11921192
partitions: _,
11931193
} => {
1194-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
1194+
assert_eq!(
1195+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
1196+
name
1197+
);
11951198
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
11961199
assert!(args.is_none());
11971200
assert!(with_hints.is_empty());
@@ -2209,7 +2212,10 @@ fn test_snowflake_copy_into() {
22092212
Statement::CopyIntoSnowflake {
22102213
into, from_stage, ..
22112214
} => {
2212-
assert_eq!(into, ObjectName::from(vec![Ident::new("a"), Ident::new("b")]));
2215+
assert_eq!(
2216+
into,
2217+
ObjectName::from(vec![Ident::new("a"), Ident::new("b")])
2218+
);
22132219
assert_eq!(
22142220
from_stage,
22152221
ObjectName::from(vec![Ident::new("@namespace"), Ident::new("stage_name")])

0 commit comments

Comments
 (0)