Cargo fmt

Author: xitep

src/ast/query.rs

@@ -1230,15 +1230,20 @@ pub enum ConnectByKind {
 impl fmt::Display for ConnectByKind {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            ConnectByKind::ConnectBy { relationships, nocycle } => {
-                write!(f, "CONNECT BY {nocycle}{relationships}",
+            ConnectByKind::ConnectBy {
+                relationships,
+                nocycle,
+            } => {
+                write!(
+                    f,
+                    "CONNECT BY {nocycle}{relationships}",
                     nocycle = if *nocycle { "NOCYCLE " } else { "" },
                     relationships = display_comma_separated(relationships)
                 )
-            },
+            }
             ConnectByKind::StartWith(condition) => {
                 write!(f, "START WITH {condition}")
-            },
+            }
         }
     }
 }

src/ast/spans.rs

@@ -2284,9 +2284,10 @@ impl Spanned for Select {
 impl Spanned for ConnectByKind {
     fn span(&self) -> Span {
         match self {
-            ConnectByKind::ConnectBy { relationships, nocycle: _ } => {
-                union_spans(relationships.iter().map(|item| item.span()))
-            }
+            ConnectByKind::ConnectBy {
+                relationships,
+                nocycle: _,
+            } => union_spans(relationships.iter().map(|item| item.span())),
             ConnectByKind::StartWith(expr) => expr.span(),
         }
     }

src/parser/mod.rs

@@ -14280,7 +14280,10 @@ impl<'a> Parser<'a> {
                 let relationships = self.with_state(ParserState::ConnectBy, |parser| {
                     parser.parse_comma_separated(Parser::parse_expr)
                 })?;
-                clauses.push(ConnectByKind::ConnectBy { relationships, nocycle });
+                clauses.push(ConnectByKind::ConnectBy {
+                    relationships,
+                    nocycle,
+                });
             } else {
                 break;
             }

tests/sqlparser_common.rs

@@ -12653,56 +12653,63 @@ fn parse_connect_by() {
         "ORDER BY employee_id"
     );
 
-    assert_eq!(dialects.verified_only_select(connect_by_1), Select {
-        select_token: AttachedToken::empty(),
-        optimizer_hint: None,
-        distinct: None,
-        select_modifiers: None,
-        top: None,
-        top_before_distinct: false,
-        projection: vec![
-            SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("employee_id"))),
-            SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("manager_id"))),
-            SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("title"))),
-        ],
-        exclude: None,
-        from: vec![TableWithJoins {
-            relation: table_from_name(ObjectName::from(vec![Ident::new("employees")])),
-            joins: vec![],
-        }],
-        into: None,
-        lateral_views: vec![],
-        prewhere: None,
-        selection: None,
-        group_by: GroupByExpr::Expressions(vec![], vec![]),
-        cluster_by: vec![],
-        distribute_by: vec![],
-        sort_by: vec![],
-        having: None,
-        named_window: vec![],
-        qualify: None,
-        window_before_qualify: false,
-        value_table_mode: None,
-        connect_by: vec![
-            ConnectByKind::StartWith(Expr::BinaryOp {
-                left: Box::new(Expr::Identifier(Ident::new("title"))),
-                op: BinaryOperator::Eq,
-                right: Box::new(Expr::Value(
-                    Value::SingleQuotedString("president".to_owned()).with_empty_span(),
-                )),
-            }.into()),
-            ConnectByKind::ConnectBy {
-                relationships: vec![Expr::BinaryOp {
-                    left: Box::new(Expr::Identifier(Ident::new("manager_id"))),
-                    op: BinaryOperator::Eq,
-                    right: Box::new(Expr::Prior(Box::new(Expr::Identifier(Ident::new(
-                        "employee_id",
-                    ))))),
-                }],
-                nocycle: false,
+    assert_eq!(
+        dialects.verified_only_select(connect_by_1),
+        Select {
+            select_token: AttachedToken::empty(),
+            optimizer_hint: None,
+            distinct: None,
+            select_modifiers: None,
+            top: None,
+            top_before_distinct: false,
+            projection: vec![
+                SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("employee_id"))),
+                SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("manager_id"))),
+                SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("title"))),
+            ],
+            exclude: None,
+            from: vec![TableWithJoins {
+                relation: table_from_name(ObjectName::from(vec![Ident::new("employees")])),
+                joins: vec![],
             }],
-        flavor: SelectFlavor::Standard,
-    });
+            into: None,
+            lateral_views: vec![],
+            prewhere: None,
+            selection: None,
+            group_by: GroupByExpr::Expressions(vec![], vec![]),
+            cluster_by: vec![],
+            distribute_by: vec![],
+            sort_by: vec![],
+            having: None,
+            named_window: vec![],
+            qualify: None,
+            window_before_qualify: false,
+            value_table_mode: None,
+            connect_by: vec![
+                ConnectByKind::StartWith(
+                    Expr::BinaryOp {
+                        left: Box::new(Expr::Identifier(Ident::new("title"))),
+                        op: BinaryOperator::Eq,
+                        right: Box::new(Expr::Value(
+                            Value::SingleQuotedString("president".to_owned()).with_empty_span(),
+                        )),
+                    }
+                    .into()
+                ),
+                ConnectByKind::ConnectBy {
+                    relationships: vec![Expr::BinaryOp {
+                        left: Box::new(Expr::Identifier(Ident::new("manager_id"))),
+                        op: BinaryOperator::Eq,
+                        right: Box::new(Expr::Prior(Box::new(Expr::Identifier(Ident::new(
+                            "employee_id",
+                        ))))),
+                    }],
+                    nocycle: false,
+                }
+            ],
+            flavor: SelectFlavor::Standard,
+        }
+    );
 
     // CONNECT BY can come before START WITH
     let connect_by_2 = concat!(
@@ -12717,6 +12724,7 @@ fn parse_connect_by() {
             select_token: AttachedToken::empty(),
             optimizer_hint: None,
             distinct: None,
+            select_modifiers: None,
             top: None,
             top_before_distinct: false,
             projection: vec![
@@ -12860,6 +12868,7 @@ fn parse_connect_by() {
             select_token: AttachedToken::empty(),
             optimizer_hint: None,
             distinct: None,
+            select_modifiers: None,
             top: None,
             top_before_distinct: false,
             projection: vec![