Skip to content

Commit 079a67b

Browse files
committed
fmt
1 parent 532a935 commit 079a67b

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
@@ -12842,7 +12842,9 @@ impl<'a> Parser<'a> {
1284212842
.parse_one_of_keywords(&[Keyword::FROM, Keyword::IN])
1284312843
.is_some()
1284412844
{
12845-
parent_name.0.insert(0, self.parse_identifier(false)?.to_object_name_part());
12845+
parent_name
12846+
.0
12847+
.insert(0, self.parse_identifier(false)?.to_object_name_part());
1284612848
}
1284712849
(None, Some(parent_name))
1284812850
}

tests/sqlparser_clickhouse.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ fn parse_delimited_identifiers() {
179179
partitions: _,
180180
json_path: _,
181181
} => {
182-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
182+
assert_eq!(
183+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
184+
name
185+
);
183186
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
184187
assert!(args.is_none());
185188
assert!(with_hints.is_empty());

tests/sqlparser_common.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2954,7 +2954,10 @@ fn parse_window_function_null_treatment_arg() {
29542954
let SelectItem::UnnamedExpr(Expr::Function(actual)) = &projection[i] else {
29552955
unreachable!()
29562956
};
2957-
assert_eq!(ObjectName::from(vec![Ident::new("FIRST_VALUE")]), actual.name);
2957+
assert_eq!(
2958+
ObjectName::from(vec![Ident::new("FIRST_VALUE")]),
2959+
actual.name
2960+
);
29582961
let FunctionArguments::List(arg_list) = &actual.args else {
29592962
panic!("expected argument list")
29602963
};
@@ -8509,7 +8512,10 @@ fn parse_merge() {
85098512
into: None,
85108513
from: vec![TableWithJoins {
85118514
relation: TableFactor::Table {
8512-
name: ObjectName::from(vec![Ident::new("s"), Ident::new("foo")]),
8515+
name: ObjectName::from(vec![
8516+
Ident::new("s"),
8517+
Ident::new("foo")
8518+
]),
85138519
alias: None,
85148520
args: None,
85158521
with_hints: vec![],

tests/sqlparser_databricks.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,15 @@ fn parse_use() {
258258
// Test single identifier with keyword and no quotes
259259
assert_eq!(
260260
databricks().verified_stmt("USE CATALOG my_catalog"),
261-
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new("my_catalog")])))
261+
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new(
262+
"my_catalog"
263+
)])))
262264
);
263265
assert_eq!(
264266
databricks().verified_stmt("USE DATABASE my_schema"),
265-
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new("my_schema")])))
267+
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new(
268+
"my_schema"
269+
)])))
266270
);
267271
assert_eq!(
268272
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
@@ -459,7 +459,10 @@ fn parse_delimited_identifiers() {
459459
partitions: _,
460460
json_path: _,
461461
} => {
462-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
462+
assert_eq!(
463+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
464+
name
465+
);
463466
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
464467
assert!(args.is_none());
465468
assert!(with_hints.is_empty());

tests/sqlparser_mssql.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,10 @@ fn parse_delimited_identifiers() {
614614
partitions: _,
615615
json_path: _,
616616
} => {
617-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
617+
assert_eq!(
618+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
619+
name
620+
);
618621
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
619622
assert!(args.is_none());
620623
assert!(with_hints.is_empty());

tests/sqlparser_mysql.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,10 @@ fn parse_show_columns() {
261261
show_in: Some(ShowStatementIn {
262262
clause: ShowStatementInClause::FROM,
263263
parent_type: None,
264-
parent_name: Some(ObjectName::from(vec![Ident::new("mydb"), Ident::new("mytable")])),
264+
parent_name: Some(ObjectName::from(vec![
265+
Ident::new("mydb"),
266+
Ident::new("mytable")
267+
])),
265268
}),
266269
filter_position: None,
267270
limit_from: None,
@@ -2872,7 +2875,9 @@ fn parse_create_table_with_column_collate() {
28722875
collation: Some(ObjectName::from(vec![Ident::new("utf8mb4_0900_ai_ci")])),
28732876
options: vec![ColumnOptionDef {
28742877
name: None,
2875-
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new("utf8mb4")]))
2878+
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new(
2879+
"utf8mb4"
2880+
)]))
28762881
}],
28772882
},],
28782883
columns

tests/sqlparser_postgres.rs

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,9 @@ fn parse_pg_on_conflict() {
16801680
assert_eq!(
16811681
OnConflictAction::DoUpdate(DoUpdate {
16821682
assignments: vec![Assignment {
1683-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1683+
target: AssignmentTarget::ColumnName(ObjectName::from(
1684+
vec!["dname".into()]
1685+
)),
16841686
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "dname".into()])
16851687
},],
16861688
selection: None
@@ -1711,14 +1713,18 @@ fn parse_pg_on_conflict() {
17111713
OnConflictAction::DoUpdate(DoUpdate {
17121714
assignments: vec![
17131715
Assignment {
1714-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1716+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1717+
"dname".into()
1718+
])),
17151719
value: Expr::CompoundIdentifier(vec![
17161720
"EXCLUDED".into(),
17171721
"dname".into()
17181722
])
17191723
},
17201724
Assignment {
1721-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["area".into()])),
1725+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1726+
"area".into()
1727+
])),
17221728
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "area".into()])
17231729
},
17241730
],
@@ -1768,7 +1774,9 @@ fn parse_pg_on_conflict() {
17681774
assert_eq!(
17691775
OnConflictAction::DoUpdate(DoUpdate {
17701776
assignments: vec![Assignment {
1771-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1777+
target: AssignmentTarget::ColumnName(ObjectName::from(
1778+
vec!["dname".into()]
1779+
)),
17721780
value: Expr::Value(Value::Placeholder("$1".to_string()))
17731781
},],
17741782
selection: Some(Expr::BinaryOp {
@@ -1802,11 +1810,16 @@ fn parse_pg_on_conflict() {
18021810
})),
18031811
..
18041812
}) => {
1805-
assert_eq!(ObjectName::from(vec![Ident::from("distributors_did_pkey")]), cname);
1813+
assert_eq!(
1814+
ObjectName::from(vec![Ident::from("distributors_did_pkey")]),
1815+
cname
1816+
);
18061817
assert_eq!(
18071818
OnConflictAction::DoUpdate(DoUpdate {
18081819
assignments: vec![Assignment {
1809-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1820+
target: AssignmentTarget::ColumnName(ObjectName::from(
1821+
vec!["dname".into()]
1822+
)),
18101823
value: Expr::Value(Value::Placeholder("$1".to_string()))
18111824
},],
18121825
selection: Some(Expr::BinaryOp {
@@ -2847,7 +2860,10 @@ fn parse_json_table_is_not_reserved() {
28472860
TableFactor::Table {
28482861
name: ObjectName(name),
28492862
..
2850-
} => assert_eq!(ObjectNamePart::Identifier(Ident::new("JSON_TABLE")), name[0]),
2863+
} => assert_eq!(
2864+
ObjectNamePart::Identifier(Ident::new("JSON_TABLE")),
2865+
name[0]
2866+
),
28512867
other => panic!("Expected: JSON_TABLE to be parsed as a table name, but got {other:?}"),
28522868
}
28532869
}
@@ -3560,7 +3576,10 @@ fn parse_delimited_identifiers() {
35603576
partitions: _,
35613577
json_path: _,
35623578
} => {
3563-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
3579+
assert_eq!(
3580+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
3581+
name
3582+
);
35643583
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
35653584
assert!(args.is_none());
35663585
assert!(with_hints.is_empty());

tests/sqlparser_redshift.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ fn parse_delimited_identifiers() {
134134
partitions: _,
135135
json_path: _,
136136
} => {
137-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
137+
assert_eq!(
138+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
139+
name
140+
);
138141
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
139142
assert!(args.is_none());
140143
assert!(with_hints.is_empty());

tests/sqlparser_snowflake.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,10 @@ fn parse_delimited_identifiers() {
11921192
partitions: _,
11931193
json_path: _,
11941194
} => {
1195-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
1195+
assert_eq!(
1196+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
1197+
name
1198+
);
11961199
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
11971200
assert!(args.is_none());
11981201
assert!(with_hints.is_empty());
@@ -2210,7 +2213,10 @@ fn test_snowflake_copy_into() {
22102213
Statement::CopyIntoSnowflake {
22112214
into, from_stage, ..
22122215
} => {
2213-
assert_eq!(into, ObjectName::from(vec![Ident::new("a"), Ident::new("b")]));
2216+
assert_eq!(
2217+
into,
2218+
ObjectName::from(vec![Ident::new("a"), Ident::new("b")])
2219+
);
22142220
assert_eq!(
22152221
from_stage,
22162222
ObjectName::from(vec![Ident::new("@namespace"), Ident::new("stage_name")])

0 commit comments

Comments
 (0)