[Oracle] Parse CONNECT BY before GROUP BY

Author: xitep

src/ast/query.rs

@@ -374,6 +374,8 @@ pub struct Select {
     pub prewhere: Option<Expr>,
     /// WHERE
     pub selection: Option<Expr>,
+    /// STARTING WITH .. CONNECT BY
+    pub connect_by: Option<ConnectBy>,
     /// GROUP BY
     pub group_by: GroupByExpr,
     /// CLUSTER BY (Hive)
@@ -395,8 +397,6 @@ pub struct Select {
     pub window_before_qualify: bool,
     /// BigQuery syntax: `SELECT AS VALUE | SELECT AS STRUCT`
     pub value_table_mode: Option<ValueTableMode>,
-    /// STARTING WITH .. CONNECT BY
-    pub connect_by: Option<ConnectBy>,
     /// Was this a FROM-first query?
     pub flavor: SelectFlavor,
 }
@@ -475,6 +475,10 @@ impl fmt::Display for Select {
             SpaceOrNewline.fmt(f)?;
             Indent(selection).fmt(f)?;
         }
+        if let Some(ref connect_by) = self.connect_by {
+            SpaceOrNewline.fmt(f)?;
+            connect_by.fmt(f)?;
+        }
         match &self.group_by {
             GroupByExpr::All(_) => {
                 SpaceOrNewline.fmt(f)?;
@@ -538,10 +542,6 @@ impl fmt::Display for Select {
                 display_comma_separated(&self.named_window).fmt(f)?;
             }
         }
-        if let Some(ref connect_by) = self.connect_by {
-            SpaceOrNewline.fmt(f)?;
-            connect_by.fmt(f)?;
-        }
         Ok(())
     }
 }

src/parser/mod.rs

@@ -14000,6 +14000,17 @@ impl<'a> Parser<'a> {
             None
         };
 
+        let connect_by = if self.dialect.supports_connect_by()
+            && self
+                .parse_one_of_keywords(&[Keyword::START, Keyword::CONNECT])
+                .is_some()
+        {
+            self.prev_token();
+            Some(self.parse_connect_by()?)
+        } else {
+            None
+        };
+
         let group_by = self
             .parse_optional_group_by()?
             .unwrap_or_else(|| GroupByExpr::Expressions(vec![], vec![]));
@@ -14052,17 +14063,6 @@ impl<'a> Parser<'a> {
             Default::default()
         };
 
-        let connect_by = if self.dialect.supports_connect_by()
-            && self
-                .parse_one_of_keywords(&[Keyword::START, Keyword::CONNECT])
-                .is_some()
-        {
-            self.prev_token();
-            Some(self.parse_connect_by()?)
-        } else {
-            None
-        };
-
         Ok(Select {
             select_token: AttachedToken(select_token),
             optimizer_hint,

tests/sqlparser_common.rs

@@ -12628,6 +12628,8 @@ fn parse_map_access_expr() {
 
 #[test]
 fn parse_connect_by() {
+    let dialects = all_dialects_where(|d| d.supports_connect_by());
+
     let expect_query = Select {
         select_token: AttachedToken::empty(),
         optimizer_hint: None,
@@ -12685,7 +12687,7 @@ fn parse_connect_by() {
     );
 
     assert_eq!(
-        all_dialects_where(|d| d.supports_connect_by()).verified_only_select(connect_by_1),
+        dialects.verified_only_select(connect_by_1),
         expect_query
     );
 
@@ -12697,8 +12699,7 @@ fn parse_connect_by() {
         "ORDER BY employee_id"
     );
     assert_eq!(
-        all_dialects_where(|d| d.supports_connect_by())
-            .verified_only_select_with_canonical(connect_by_2, connect_by_1),
+        dialects.verified_only_select_with_canonical(connect_by_2, connect_by_1),
         expect_query
     );
 
@@ -12711,7 +12712,7 @@ fn parse_connect_by() {
         "ORDER BY employee_id"
     );
     assert_eq!(
-        all_dialects_where(|d| d.supports_connect_by()).verified_only_select(connect_by_3),
+        dialects.verified_only_select(connect_by_3),
         Select {
             select_token: AttachedToken::empty(),
             optimizer_hint: None,
@@ -12773,7 +12774,7 @@ fn parse_connect_by() {
         "WHERE employee_id <> 42 ",
         "ORDER BY employee_id"
     );
-    all_dialects_where(|d| d.supports_connect_by())
+    dialects
         .parse_sql_statements(connect_by_4)
         .expect_err("should have failed");
 
@@ -12791,7 +12792,7 @@ fn parse_connect_by() {
     // no START WITH and NOCYCLE
     let connect_by_5 = "SELECT child, parent FROM t CONNECT BY NOCYCLE parent = PRIOR child";
     assert_eq!(
-        all_dialects_where(|d| d.supports_connect_by()).verified_only_select(connect_by_5),
+        dialects.verified_only_select(connect_by_5),
         Select {
             select_token: AttachedToken::empty(),
             optimizer_hint: None,
@@ -12832,6 +12833,13 @@ fn parse_connect_by() {
             flavor: SelectFlavor::Standard,
         }
     );
+
+    // ~ CONNECT BY after WHERE and before GROUP BY
+    dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 GROUP BY 3");
+    dialects.verified_only_select("SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
+    dialects.verified_only_select_with_canonical(
+        "SELECT 0 FROM t WHERE 1 = 1 CONNECT BY 2 = 2 START WITH 'a' = 'a' GROUP BY 3",
+        "SELECT 0 FROM t WHERE 1 = 1 START WITH 'a' = 'a' CONNECT BY 2 = 2 GROUP BY 3");
 }
 
 #[test]