Skip to content

Commit 55baf17

Browse files
ayman-sigmaayman-sigma
committed
fmt
1 parent d0aa469 commit 55baf17

File tree

10 files changed

+75
-23
lines changed

10 files changed

+75
-23
lines changed

‎src/parser/mod.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14085,7 +14085,9 @@ impl<'a> Parser<'a> {
1408514085
.parse_one_of_keywords(&[Keyword::FROM, Keyword::IN])
1408614086
.is_some()
1408714087
{
14088-
parent_name.0.insert(0, self.parse_identifier()?.to_object_name_part());
14088+
parent_name
14089+
.0
14090+
.insert(0, self.parse_identifier()?.to_object_name_part());
1408914091
}
1409014092
(None, Some(parent_name))
1409114093
}

‎tests/sqlparser_clickhouse.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ fn parse_delimited_identifiers() {
166166
version,
167167
..
168168
} => {
169-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
169+
assert_eq!(
170+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
171+
name
172+
);
170173
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
171174
assert!(args.is_none());
172175
assert!(with_hints.is_empty());

‎tests/sqlparser_common.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2935,7 +2935,10 @@ fn parse_window_function_null_treatment_arg() {
29352935
let SelectItem::UnnamedExpr(Expr::Function(actual)) = &projection[i] else {
29362936
unreachable!()
29372937
};
2938-
assert_eq!(ObjectName::from(vec![Ident::new("FIRST_VALUE")]), actual.name);
2938+
assert_eq!(
2939+
ObjectName::from(vec![Ident::new("FIRST_VALUE")]),
2940+
actual.name
2941+
);
29392942
let FunctionArguments::List(arg_list) = &actual.args else {
29402943
panic!("expected argument list")
29412944
};
@@ -8730,9 +8733,10 @@ fn parse_merge() {
87308733
)],
87318734
into: None,
87328735
from: vec![TableWithJoins {
8733-
relation: table_from_name(ObjectName::from(vec![
8734-
Ident::new("s"),
8735-
Ident::new("foo")
8736+
relation: table_from_name( ObjectName::from(vec![
8737+
Ident::new("s"),
8738+
Ident::new("foo")
8739+
87368740
])),
87378741
joins: vec![],
87388742
}],

‎tests/sqlparser_databricks.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,15 @@ fn parse_use() {
249249
// Test single identifier with keyword and no quotes
250250
assert_eq!(
251251
databricks().verified_stmt("USE CATALOG my_catalog"),
252-
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new("my_catalog")])))
252+
Statement::Use(Use::Catalog(ObjectName::from(vec![Ident::new(
253+
"my_catalog"
254+
)])))
253255
);
254256
assert_eq!(
255257
databricks().verified_stmt("USE DATABASE my_schema"),
256-
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new("my_schema")])))
258+
Statement::Use(Use::Database(ObjectName::from(vec![Ident::new(
259+
"my_schema"
260+
)])))
257261
);
258262
assert_eq!(
259263
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
@@ -461,7 +461,10 @@ fn parse_delimited_identifiers() {
461461
json_path: _,
462462
sample: _,
463463
} => {
464-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
464+
assert_eq!(
465+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
466+
name
467+
);
465468
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
466469
assert!(args.is_none());
467470
assert!(with_hints.is_empty());

‎tests/sqlparser_mssql.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,10 @@ fn parse_delimited_identifiers() {
618618
version,
619619
..
620620
} => {
621-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
621+
assert_eq!(
622+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
623+
name
624+
);
622625
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
623626
assert!(args.is_none());
624627
assert!(with_hints.is_empty());

‎tests/sqlparser_mysql.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,10 @@ fn parse_show_columns() {
269269
show_in: Some(ShowStatementIn {
270270
clause: ShowStatementInClause::FROM,
271271
parent_type: None,
272-
parent_name: Some(ObjectName::from(vec![Ident::new("mydb"), Ident::new("mytable")])),
272+
parent_name: Some(ObjectName::from(vec![
273+
Ident::new("mydb"),
274+
Ident::new("mytable")
275+
])),
273276
}),
274277
filter_position: None,
275278
limit_from: None,
@@ -2876,7 +2879,9 @@ fn parse_create_table_with_column_collate() {
28762879
collation: Some(ObjectName::from(vec![Ident::new("utf8mb4_0900_ai_ci")])),
28772880
options: vec![ColumnOptionDef {
28782881
name: None,
2879-
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new("utf8mb4")]))
2882+
option: ColumnOption::CharacterSet(ObjectName::from(vec![Ident::new(
2883+
"utf8mb4"
2884+
)]))
28802885
}],
28812886
},],
28822887
columns

‎tests/sqlparser_postgres.rs‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,9 @@ fn parse_pg_on_conflict() {
17931793
assert_eq!(
17941794
OnConflictAction::DoUpdate(DoUpdate {
17951795
assignments: vec![Assignment {
1796-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1796+
target: AssignmentTarget::ColumnName(ObjectName::from(
1797+
vec!["dname".into()]
1798+
)),
17971799
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "dname".into()])
17981800
},],
17991801
selection: None
@@ -1824,14 +1826,18 @@ fn parse_pg_on_conflict() {
18241826
OnConflictAction::DoUpdate(DoUpdate {
18251827
assignments: vec![
18261828
Assignment {
1827-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1829+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1830+
"dname".into()
1831+
])),
18281832
value: Expr::CompoundIdentifier(vec![
18291833
"EXCLUDED".into(),
18301834
"dname".into()
18311835
])
18321836
},
18331837
Assignment {
1834-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["area".into()])),
1838+
target: AssignmentTarget::ColumnName(ObjectName::from(vec![
1839+
"area".into()
1840+
])),
18351841
value: Expr::CompoundIdentifier(vec!["EXCLUDED".into(), "area".into()])
18361842
},
18371843
],
@@ -1881,7 +1887,9 @@ fn parse_pg_on_conflict() {
18811887
assert_eq!(
18821888
OnConflictAction::DoUpdate(DoUpdate {
18831889
assignments: vec![Assignment {
1884-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1890+
target: AssignmentTarget::ColumnName(ObjectName::from(
1891+
vec!["dname".into()]
1892+
)),
18851893
value: Expr::Value(Value::Placeholder("$1".to_string()))
18861894
},],
18871895
selection: Some(Expr::BinaryOp {
@@ -1915,11 +1923,16 @@ fn parse_pg_on_conflict() {
19151923
})),
19161924
..
19171925
}) => {
1918-
assert_eq!(ObjectName::from(vec![Ident::from("distributors_did_pkey")]), cname);
1926+
assert_eq!(
1927+
ObjectName::from(vec![Ident::from("distributors_did_pkey")]),
1928+
cname
1929+
);
19191930
assert_eq!(
19201931
OnConflictAction::DoUpdate(DoUpdate {
19211932
assignments: vec![Assignment {
1922-
target: AssignmentTarget::ColumnName(ObjectName::from(vec!["dname".into()])),
1933+
target: AssignmentTarget::ColumnName(ObjectName::from(
1934+
vec!["dname".into()]
1935+
)),
19231936
value: Expr::Value(Value::Placeholder("$1".to_string()))
19241937
},],
19251938
selection: Some(Expr::BinaryOp {
@@ -2963,7 +2976,10 @@ fn parse_json_table_is_not_reserved() {
29632976
TableFactor::Table {
29642977
name: ObjectName(name),
29652978
..
2966-
} => assert_eq!(ObjectNamePart::Identifier(Ident::new("JSON_TABLE")), name[0]),
2979+
} => assert_eq!(
2980+
ObjectNamePart::Identifier(Ident::new("JSON_TABLE")),
2981+
name[0]
2982+
),
29672983
other => panic!("Expected: JSON_TABLE to be parsed as a table name, but got {other:?}"),
29682984
}
29692985
}
@@ -3679,7 +3695,10 @@ fn parse_delimited_identifiers() {
36793695
version,
36803696
..
36813697
} => {
3682-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
3698+
assert_eq!(
3699+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
3700+
name
3701+
);
36833702
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
36843703
assert!(args.is_none());
36853704
assert!(with_hints.is_empty());

‎tests/sqlparser_redshift.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ fn parse_delimited_identifiers() {
114114
version,
115115
..
116116
} => {
117-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
117+
assert_eq!(
118+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
119+
name
120+
);
118121
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
119122
assert!(args.is_none());
120123
assert!(with_hints.is_empty());

‎tests/sqlparser_snowflake.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,10 @@ fn parse_delimited_identifiers() {
12741274
version,
12751275
..
12761276
} => {
1277-
assert_eq!(ObjectName::from(vec![Ident::with_quote('"', "a table")]), name);
1277+
assert_eq!(
1278+
ObjectName::from(vec![Ident::with_quote('"', "a table")]),
1279+
name
1280+
);
12781281
assert_eq!(Ident::with_quote('"', "alias"), alias.unwrap().name);
12791282
assert!(args.is_none());
12801283
assert!(with_hints.is_empty());
@@ -2330,7 +2333,10 @@ fn test_snowflake_copy_into() {
23302333
Statement::CopyIntoSnowflake {
23312334
into, from_stage, ..
23322335
} => {
2333-
assert_eq!(into, ObjectName::from(vec![Ident::new("a"), Ident::new("b")]));
2336+
assert_eq!(
2337+
into,
2338+
ObjectName::from(vec![Ident::new("a"), Ident::new("b")])
2339+
);
23342340
assert_eq!(
23352341
from_stage,
23362342
ObjectName::from(vec![Ident::new("@namespace"), Ident::new("stage_name")])

0 commit comments

Comments
 (0)