Skip to content

Commit 4098d05

Browse files
committed
Cargo fmt
1 parent dc91258 commit 4098d05

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

src/parser/merge.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use alloc::{boxed::Box, format, string::ToString, vec, vec::Vec};
1717

1818
use crate::{
1919
ast::{
20-
Merge, MergeAction, MergeClause, MergeClauseKind, MergeInsertExpr, MergeInsertKind, MergeUpdateExpr, ObjectName, ObjectNamePart, OutputClause, SetExpr, Statement
20+
Merge, MergeAction, MergeClause, MergeClauseKind, MergeInsertExpr, MergeInsertKind,
21+
MergeUpdateExpr, ObjectName, ObjectNamePart, OutputClause, SetExpr, Statement,
2122
},
2223
dialect::{BigQueryDialect, GenericDialect, MySqlDialect},
2324
keywords::Keyword,
@@ -211,7 +212,10 @@ impl Parser<'_> {
211212
Ok(clauses)
212213
}
213214

214-
fn parse_merge_clause_insert_columns(&mut self, allow_empty: bool) -> Result<Vec<ObjectName>, ParserError> {
215+
fn parse_merge_clause_insert_columns(
216+
&mut self,
217+
allow_empty: bool,
218+
) -> Result<Vec<ObjectName>, ParserError> {
215219
if self.dialect.supports_merge_insert_qualified_columns() {
216220
self.parse_parenthesized_qualified_column_list(IsOptional::Optional, allow_empty)
217221
} else {
@@ -228,7 +232,8 @@ impl Parser<'_> {
228232
allow_empty: bool,
229233
) -> Result<Vec<ObjectName>, ParserError> {
230234
self.parse_parenthesized_column_list_inner(optional, allow_empty, |p| {
231-
p.parse_identifier().map(|ident| ObjectName(vec![ObjectNamePart::Identifier(ident)]))
235+
p.parse_identifier()
236+
.map(|ident| ObjectName(vec![ObjectNamePart::Identifier(ident)]))
232237
})
233238
}
234239

tests/sqlparser_bigquery.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,10 @@ fn parse_merge() {
19201920
predicate: Some(Expr::value(number("1"))),
19211921
action: MergeAction::Insert(MergeInsertExpr {
19221922
insert_token: AttachedToken::empty(),
1923-
columns: vec![Ident::new("product").into(), Ident::new("quantity").into(),],
1923+
columns: vec![
1924+
Ident::new("product").into(),
1925+
Ident::new("quantity").into(),
1926+
],
19241927
kind_token: AttachedToken::empty(),
19251928
kind: MergeInsertKind::Row,
19261929
insert_predicate: None,
@@ -1932,7 +1935,10 @@ fn parse_merge() {
19321935
predicate: None,
19331936
action: MergeAction::Insert(MergeInsertExpr {
19341937
insert_token: AttachedToken::empty(),
1935-
columns: vec![Ident::new("product").into(), Ident::new("quantity").into(),],
1938+
columns: vec![
1939+
Ident::new("product").into(),
1940+
Ident::new("quantity").into(),
1941+
],
19361942
kind_token: AttachedToken::empty(),
19371943
kind: MergeInsertKind::Row,
19381944
insert_predicate: None,

tests/sqlparser_common.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9925,7 +9925,11 @@ fn parse_merge() {
99259925
predicate: None,
99269926
action: MergeAction::Insert(MergeInsertExpr {
99279927
insert_token: AttachedToken::empty(),
9928-
columns: vec![Ident::new("A").into(), Ident::new("B").into(), Ident::new("C").into()],
9928+
columns: vec![
9929+
Ident::new("A").into(),
9930+
Ident::new("B").into(),
9931+
Ident::new("C").into()
9932+
],
99299933
kind_token: AttachedToken::empty(),
99309934
kind: MergeInsertKind::Values(Values {
99319935
value_keyword: false,

0 commit comments

Comments
 (0)