databricks/generic: CROSS JOIN with constraints

Author: lustefaniak

src/ast/query.rs

@@ -1150,7 +1150,9 @@ impl fmt::Display for Join {
                 self.relation,
                 suffix(constraint)
             ),
-            JoinOperator::CrossJoin => write!(f, " CROSS JOIN {}", self.relation),
+            JoinOperator::CrossJoin(constraint) => {
+                write!(f, " CROSS JOIN {}{}", self.relation, suffix(constraint))
+            }
             JoinOperator::LeftSemi(constraint) => write!(
                 f,
                 " {}LEFT SEMI JOIN {}{}",
@@ -1194,7 +1196,7 @@ pub enum JoinOperator {
     LeftOuter(JoinConstraint),
     RightOuter(JoinConstraint),
     FullOuter(JoinConstraint),
-    CrossJoin,
+    CrossJoin(JoinConstraint),
     /// LEFT SEMI (non-standard)
     LeftSemi(JoinConstraint),
     /// RIGHT SEMI (non-standard)

src/parser/mod.rs

@@ -7205,13 +7205,15 @@ impl<'a> Parser<'a> {
                     JoinOperator::CrossJoin
                 } else if self.parse_keyword(Keyword::APPLY) {
                     // MSSQL extension, similar to CROSS JOIN LATERAL
-                    JoinOperator::CrossApply
+                    |_| JoinOperator::CrossApply
                 } else {
                     return self.expected("JOIN or APPLY after CROSS", self.peek_token());
                 };
+                let relation = self.parse_table_factor()?;
+                let join_constraint = self.parse_join_constraint(false)?;
                 Join {
-                    relation: self.parse_table_factor()?,
-                    join_operator,
+                    relation,
+                    join_operator: join_operator(join_constraint),
                 }
             } else if self.parse_keyword(Keyword::OUTER) {
                 // MSSQL extension, similar to LEFT JOIN LATERAL .. ON 1=1

tests/sqlparser_common.rs

@@ -4962,7 +4962,7 @@ fn parse_cross_join() {
                 version: None,
                 partitions: vec![],
             },
-            join_operator: JoinOperator::CrossJoin,
+            join_operator: JoinOperator::CrossJoin(JoinConstraint::None),
         },
         only(only(select.from).joins),
     );

tests/sqlparser_databricks.rs

@@ -227,3 +227,8 @@ fn test_array_struct_access() {
     databricks()
         .verified_stmt("SELECT id, extra_questions[0].label AS question, FROM AS detailed_survey");
 }
+
+#[test]
+fn test_cross_join() {
+    databricks_and_generic().verified_stmt("SELECT * FROM tbl CROSS JOIN tbl2 ON tbl.id = tbl2.id");
+}