Skip to content

Commit 068fd83

Browse files
committed
Cargo fmt
1 parent 4b65891 commit 068fd83

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
@@ -1222,7 +1222,7 @@ impl fmt::Display for ConnectBy {
12221222
let Self {
12231223
condition,
12241224
relationships,
1225-
nocycle
1225+
nocycle,
12261226
} = self;
12271227
if let Some(condition) = condition {
12281228
write!(f, "START WITH {condition} ")?;

src/ast/spans.rs

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

22922292
union_spans(
2293-
condition.iter().map(Spanned::span).chain(relationships.iter().map(|item| item.span())),
2293+
condition
2294+
.iter()
2295+
.map(Spanned::span)
2296+
.chain(relationships.iter().map(|item| item.span())),
22942297
)
22952298
}
22962299
}

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
@@ -14280,10 +14280,14 @@ impl<'a> Parser<'a> {
1428014280

1428114281
/// Parse a `CONNECT BY` clause (Oracle-style hierarchical query support).
1428214282
pub fn parse_connect_by(&mut self) -> Result<ConnectBy, ParserError> {
14283-
let (condition, relationships, nocycle) = if self.parse_keywords(&[Keyword::CONNECT, Keyword::BY]) {
14283+
let (condition, relationships, nocycle) = if self
14284+
.parse_keywords(&[Keyword::CONNECT, Keyword::BY])
14285+
{
1428414286
let (relationships, nocycle) = self.with_state(ParserState::ConnectBy, |parser| {
1428514287
let nocycle = parser.parse_keyword(Keyword::NOCYCLE);
14286-
parser.parse_comma_separated(Parser::parse_expr).map(|exprs| (exprs, nocycle))
14288+
parser
14289+
.parse_comma_separated(Parser::parse_expr)
14290+
.map(|exprs| (exprs, nocycle))
1428714291
})?;
1428814292
let condition = if self.parse_keywords(&[Keyword::START, Keyword::WITH]) {
1428914293
Some(self.parse_expr()?)
@@ -14304,7 +14308,7 @@ impl<'a> Parser<'a> {
1430414308
Ok(ConnectBy {
1430514309
condition,
1430614310
relationships,
14307-
nocycle
14311+
nocycle,
1430814312
})
1430914313
}
1431014314

tests/sqlparser_common.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12703,10 +12703,7 @@ fn parse_connect_by() {
1270312703
"ORDER BY employee_id"
1270412704
);
1270512705

12706-
assert_eq!(
12707-
dialects.verified_only_select(connect_by_1),
12708-
expect_query
12709-
);
12706+
assert_eq!(dialects.verified_only_select(connect_by_1), expect_query);
1271012707

1271112708
// CONNECT BY can come before START WITH
1271212709
let connect_by_2 = concat!(
@@ -12854,10 +12851,13 @@ fn parse_connect_by() {
1285412851

1285512852
// ~ CONNECT BY after WHERE and before GROUP BY
1285612853
dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 GROUP BY 3");
12857-
dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
12854+
dialects.verified_only_select(
12855+
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3",
12856+
);
1285812857
dialects.verified_only_select_with_canonical(
1285912858
"SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 START WITH 'a' = 'a' GROUP BY 3",
12860-
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
12859+
"SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3",
12860+
);
1286112861
}
1286212862

1286312863
#[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)