Merge pull request #2170 from taozhi8833998/fix-except-noql

fix: except op in noql
taozhi8833998 · Oct 13, 2024 · ef7aa9e · ef7aa9e
2 parents a2124c3 + b843ba1
commit ef7aa9e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/pegjs/bigquery.pegjs b/pegjs/bigquery.pegjs
@@ -30,6 +30,7 @@
     'END': true,
     'EXISTS': true,
     'EXPLAIN': true,
+    'EXCEPT': true,
 
     'FALSE': true,
     'FROM': true,

diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -28,6 +28,7 @@
     'END': true,
     'EXISTS': true,
     'EXPLAIN': true,
+    'EXCEPT': true,
 
     'FALSE': true,
     'FROM': true,

diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -29,6 +29,7 @@
     'END': true,
     'EXISTS': true,
     'EXPLAIN': true,
+    'EXCEPT': true,
 
     'FALSE': true,
     'FROM': true,

diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -28,6 +28,7 @@
     'END': true,
     'EXISTS': true,
     'EXPLAIN': true,
+    'EXCEPT': true,
 
     'FALSE': true,
     'FROM': true,

diff --git a/test/noql.spec.js b/test/noql.spec.js
@@ -29,12 +29,17 @@ describe('noql', () => {
     expect(getParsedSql(sql)).to.be.equal(`SELECT *, convert("Replacement Cost", 'int') AS "s" FROM "films"`)
   })
 
-  it('should support intersect', () => {
-    const sql = `SELECT  *
+  it('should support except and intersect', () => {
+    let sql = `SELECT *
+      FROM "top-rated-films" 
+      EXCEPT
+      SELECT *
+      FROM "most-popular-films"
+      ORDER BY name`
+    expect(getParsedSql(sql)).to.be.equal('SELECT * FROM "top-rated-films" EXCEPT SELECT * FROM "most-popular-films" ORDER BY "name" ASC')
+    sql = `SELECT  *
     FROM "most-popular-films"
-
     INTERSECT
-
     SELECT  *
     FROM "top-rated-films"`
     expect(getParsedSql(sql)).to.be.equal('SELECT * FROM "most-popular-films" INTERSECT SELECT * FROM "top-rated-films"')