add sqlite cross join support

roeemalis · roeemalis · commit 4038b9ed2ed9 · 2026-02-03T15:55:33.000+02:00
diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -15,6 +15,7 @@
     'CREATE': true,
     'CONTAINS': true,
     'COUNT': true,
+    'CROSS': true,
     'CURRENT_DATE': true,
     'CURRENT_TIME': true,
     'CURRENT_TIMESTAMP': true,
@@ -1649,6 +1650,7 @@ table_base
 
 join_op
   = KW_LEFT __ KW_OUTER? __ KW_JOIN { return 'LEFT JOIN'; }
+  / KW_CROSS __ KW_JOIN { return 'CROSS JOIN'; }
   / (KW_INNER __)? KW_JOIN { return 'INNER JOIN'; }
 
 table_name
@@ -2790,6 +2792,7 @@ KW_COLLATE  = "COLLATE"i    !ident_start { return 'COLLATE'; }
 KW_ON       = "ON"i       !ident_start
 KW_LEFT     = "LEFT"i     !ident_start
 KW_INNER    = "INNER"i    !ident_start
+KW_CROSS    = "CROSS"i    !ident_start
 KW_JOIN     = "JOIN"i     !ident_start
 KW_OUTER    = "OUTER"i    !ident_start
 KW_OVER     = "OVER"i     !ident_start
diff --git a/test/sqlite.spec.js b/test/sqlite.spec.js
@@ -300,4 +300,46 @@ describe('sqlite', () => {
         expect(getParsedSql(sql)).to.be.equal(sql)
       });
   });
+
+  it('should support cross join with table aliases', () => {
+    const sql = 'SELECT * FROM users AS u CROSS JOIN products AS p';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "users" AS "u" CROSS JOIN "products" AS "p"'
+    );
+  });
+
+  it('should support cross join with using clause', () => {
+    const sql = 'SELECT * FROM users CROSS JOIN products USING (id)';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "users" CROSS JOIN "products" USING (id)'
+    );
+  });
+
+  it('should support cross join with on clause', () => {
+    const sql = 'SELECT * FROM t1 CROSS JOIN t2 ON t1.id = t2.id';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "t1" CROSS JOIN "t2" ON "t1"."id" = "t2"."id"'
+    );
+  });
+
+  it('should support multiple cross joins', () => {
+    const sql = 'SELECT * FROM t1 CROSS JOIN t2 CROSS JOIN t3';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "t1" CROSS JOIN "t2" CROSS JOIN "t3"'
+    );
+  });
+
+  it('should support cross join with subquery', () => {
+    const sql = 'SELECT * FROM users CROSS JOIN (SELECT * FROM products WHERE price > 50) AS p';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "users" CROSS JOIN (SELECT * FROM "products" WHERE "price" > 50) AS "p"'
+    );
+  });
+
+  it('should support cross join mixed with INNER JOIN', () => {
+    const sql = 'SELECT * FROM t1 CROSS JOIN t2 INNER JOIN t3 ON t2.id = t3.id';
+    expect(getParsedSql(sql)).to.be.equal(
+      'SELECT * FROM "t1" CROSS JOIN "t2" INNER JOIN "t3" ON "t2"."id" = "t3"."id"'
+    );
+  });
 })
