diff --git a/src/parser.pegjs b/src/parser.pegjs index cda537c2..28303abc 100644 --- a/src/parser.pegjs +++ b/src/parser.pegjs @@ -696,7 +696,7 @@ join_expr_right right: read(right), }); } - / c1:__ op:(natural_join / cross_join) right:(__ alias$table_factor) { + / c1:__ op:(natural_join / !sqlite kw:cross_join { return kw; }) right:(__ alias$table_factor) { return (left: any) => ({ type: "join_expr", left: trailing(left, c1), @@ -834,6 +834,7 @@ partitioned_table join_op = &mysql kw:STRAIGHT_JOIN { return kw; } + / &sqlite kw:cross_join { return kw; } / join_type natural_join diff --git a/test/dml/insert.test.ts b/test/dml/insert.test.ts index f9e4a481..619b7064 100644 --- a/test/dml/insert.test.ts +++ b/test/dml/insert.test.ts @@ -205,8 +205,10 @@ describe("insert into", () => { }); // Issue #124 - it("supports ON CONFLICT together with SELECT .. JOIN", () => { - testWc("INSERT INTO tbl SELECT * FROM foo CROSS JOIN bar ON CONFLICT DO NOTHING"); + dialect(["postgresql", "plpgsql"], () => { + it("supports ON CONFLICT together with SELECT .. JOIN", () => { + testWc("INSERT INTO tbl SELECT * FROM foo CROSS JOIN bar ON CONFLICT DO NOTHING"); + }); }); }); }); diff --git a/test/select/join.test.ts b/test/select/join.test.ts index 2b5575a6..ce7cce8b 100644 --- a/test/select/join.test.ts +++ b/test/select/join.test.ts @@ -74,6 +74,11 @@ describe("join", () => { }); dialect("sqlite", () => { + it("supports CROSS JOIN with ON / USING", () => { + testWc("SELECT c FROM t1 CROSS JOIN t2 ON t1.x = t2.x"); + testWc("SELECT c FROM t1 CROSS JOIN t2 USING (x)"); + }); + it("supports NATURAL FULL [OUTER] JOIN", () => { testWc("SELECT c FROM t1 NATURAL FULL JOIN t2"); testWc("SELECT c FROM t1 NATURAL FULL OUTER JOIN t2");