Skip to content

Commit 0807255

Browse files
committed
Cargo fmt
1 parent ad2b0fa commit 0807255

6 files changed

Lines changed: 24 additions & 15 deletions

File tree

src/ast/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ impl fmt::Display for ConnectBy {
11121112
let Self {
11131113
condition,
11141114
relationships,
1115-
nocycle
1115+
nocycle,
11161116
} = self;
11171117
if let Some(condition) = condition {
11181118
write!(f, "START WITH {condition} ")?;

src/ast/spans.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2285,11 +2285,14 @@ impl Spanned for ConnectBy {
22852285
let ConnectBy {
22862286
condition,
22872287
relationships,
2288-
nocycle: _
2288+
nocycle: _,
22892289
} = self;
22902290

22912291
union_spans(
2292-
condition.iter().map(Spanned::span).chain(relationships.iter().map(|item| item.span())),
2292+
condition
2293+
.iter()
2294+
.map(Spanned::span)
2295+
.chain(relationships.iter().map(|item| item.span())),
22932296
)
22942297
}
22952298
}

src/dialect/oracle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::{
2222
tokenizer::Token,
2323
};
2424

25-
use super::{Dialect, Precedence, keywords::Keyword};
25+
use super::{keywords::Keyword, Dialect, Precedence};
2626

2727
const RESERVED_KEYWORDS_FOR_SELECT_ITEM_OPERATOR: [Keyword; 1] = [Keyword::CONNECT_BY_ROOT];
2828

src/parser/mod.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14185,10 +14185,14 @@ impl<'a> Parser<'a> {
1418514185

1418614186
/// Parse a `CONNECT BY` clause (Oracle-style hierarchical query support).
1418714187
pub fn parse_connect_by(&mut self) -> Result<ConnectBy, ParserError> {
14188-
let (condition, relationships, nocycle) = if self.parse_keywords(&[Keyword::CONNECT, Keyword::BY]) {
14188+
let (condition, relationships, nocycle) = if self
14189+
.parse_keywords(&[Keyword::CONNECT, Keyword::BY])
14190+
{
1418914191
let (relationships, nocycle) = self.with_state(ParserState::ConnectBy, |parser| {
1419014192
let nocycle = parser.parse_keyword(Keyword::NOCYCLE);
14191-
parser.parse_comma_separated(Parser::parse_expr).map(|exprs| (exprs, nocycle))
14193+
parser
14194+
.parse_comma_separated(Parser::parse_expr)
14195+
.map(|exprs| (exprs, nocycle))
1419214196
})?;
1419314197
let condition = if self.parse_keywords(&[Keyword::START, Keyword::WITH]) {
1419414198
Some(self.parse_expr()?)
@@ -14209,7 +14213,7 @@ impl<'a> Parser<'a> {
1420914213
Ok(ConnectBy {
1421014214
condition,
1421114215
relationships,
14212-
nocycle
14216+
nocycle,
1421314217
})
1421414218
}
1421514219

tests/sqlparser_common.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12686,10 +12686,7 @@ fn parse_connect_by() {
1268612686
"ORDER BY employee_id"
1268712687
);
1268812688

12689-
assert_eq!(
12690-
dialects.verified_only_select(connect_by_1),
12691-
expect_query
12692-
);
12689+
assert_eq!(dialects.verified_only_select(connect_by_1), expect_query);
1269312690

1269412691
// CONNECT BY can come before START WITH
1269512692
let connect_by_2 = concat!(
@@ -12836,10 +12833,13 @@ fn parse_connect_by() {
1283612833

1283712834
// ~ CONNECT BY after WHERE and before GROUP BY
1283812835
dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 GROUP BY 3");
12839-
dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
12836+
dialects.verified_only_select(
12837+
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3",
12838+
);
1284012839
dialects.verified_only_select_with_canonical(
1284112840
"SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 START WITH 'a' = 'a' GROUP BY 3",
12842-
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
12841+
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3",
12842+
);
1284312843
}
1284412844

1284512845
#[test]

tests/sqlparser_oracle.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ fn test_connect_by() {
401401
WHERE level <= 3 AND department_id = 80 \
402402
START WITH last_name = 'King' \
403403
CONNECT BY NOCYCLE PRIOR employee_id = manager_id AND LEVEL <= 4 \
404-
ORDER BY \"Employee\", \"Cycle\", LEVEL, \"Path\"");
404+
ORDER BY \"Employee\", \"Cycle\", LEVEL, \"Path\"",
405+
);
405406

406407
// ~ CONNECT_BY_ROOT
407408
oracle_dialect.verified_only_select(
@@ -410,5 +411,6 @@ fn test_connect_by() {
410411
FROM employees \
411412
WHERE LEVEL > 1 AND department_id = 110 \
412413
CONNECT BY PRIOR employee_id = manager_id \
413-
ORDER BY \"Employee\", \"Manager\", \"Pathlen\", \"Path\"");
414+
ORDER BY \"Employee\", \"Manager\", \"Pathlen\", \"Path\"",
415+
);
414416
}

0 commit comments

Comments
 (0)