Add additional set operations

src/sqlParser.jison

@@ -90,6 +90,8 @@ MODE                                                              return 'MODE'
 OJ                                                                return 'OJ'
 LIMIT                                                             return 'LIMIT'
 UNION                                                             return 'UNION'
+INTERSECT                                                         return 'INTERSECT'
+EXCEPT                                                            return 'EXCEPT'
 
 ","                                                               return ','
 "="                                                               return '='
@@ -161,31 +163,36 @@ UNION                                                             return 'UNION'
 
 main
   : selectClause semicolonOpt EOF { return {nodeType: 'Main', value: $1, hasSemicolon: $2}; }
-  | unionClause semicolonOpt EOF { return {nodeType: 'Main', value: $1, hasSemicolon: $2}; }
+  | setClause semicolonOpt EOF { return {nodeType: 'Main', value: $1, hasSemicolon: $2}; }
   ;
 
 semicolonOpt
   : ';' { $$ = true }
   | { $$ = false }
   ;
 
-unionClause
-  : unionClauseNotParenthesized { $$ = $1 }
-  | unionClauseParenthesized order_by_opt limit_opt { $$ = $1, $$.orderBy = $2, $$.limit = $3; }
+setOperation
+  : UNION
+  | INTERSECT
+  | EXCEPT;
+
+setClause
+  : setClauseNotParenthesized { $$ = $1 }
+  | setClauseParenthesized order_by_opt limit_opt { $$ = $1, $$.orderBy = $2, $$.limit = $3; }
   ;
 
-unionClauseParenthesized
-  : selectClauseParenthesized UNION distinctOpt selectClauseParenthesized { $$ = { type: 'Union', left: $1, distinctOpt: $3, right: $4 }; }
-  | selectClauseParenthesized UNION distinctOpt unionClauseParenthesized { $$ = { type: 'Union', left: $1, distinctOpt: $3, right: $4 }; }
+setClauseParenthesized
+  : selectClauseParenthesized setOperation distinctOpt selectClauseParenthesized { $$ = { type: $2.charAt(0).toUpperCase() + $2.substr(1).toLowerCase(), left: $1, distinctOpt: $3, right: $4 }; }
+  | selectClauseParenthesized setOperation distinctOpt setClauseParenthesized { $$ = { type: $2.charAt(0).toUpperCase() + $2.substr(1).toLowerCase(), left: $1, distinctOpt: $3, right: $4 }; }
   ;
 
 selectClauseParenthesized
   : '(' selectClause ')' { $$ = { type: 'SelectParenthesized', value: $2 }; }
   ;
 
-unionClauseNotParenthesized
-  : selectClause UNION distinctOpt selectClause { $$ = { type: 'Union', left: $1, distinctOpt: $3, right: $4 } }
-  | selectClause UNION distinctOpt unionClauseNotParenthesized { $$ = { type: 'Union', left: $1, distinctOpt: $3, right: $4 } }
+setClauseNotParenthesized
+  : selectClause setOperation distinctOpt selectClause { $$ = { type: $2.charAt(0).toUpperCase() + $2.substr(1).toLowerCase(), left: $1, distinctOpt: $3, right: $4 } }
+  | selectClause setOperation distinctOpt setClauseNotParenthesized { $$ = { type: $2.charAt(0).toUpperCase() + $2.substr(1).toLowerCase(), left: $1, distinctOpt: $3, right: $4 } }
   ;
 
 selectClause

src/stringify.js

@@ -545,6 +545,22 @@ Sql.prototype.travelUnion = function (ast) {
   }
   this.travel(ast.right);
 }
+Sql.prototype.travelIntersect = function (ast) {
+  this.travel(ast.left);
+  this.appendKeyword('INTERSECT');
+  if (ast.distinctOpt) {
+    this.appendKeyword(ast.distinctOpt)
+  }
+  this.travel(ast.right);
+}
+Sql.prototype.travelExcept = function (ast) {
+  this.travel(ast.left);
+  this.appendKeyword('EXCEPT');
+  if (ast.distinctOpt) {
+    this.appendKeyword(ast.distinctOpt)
+  }
+  this.travel(ast.right);
+}
 Sql.prototype.travelSelectParenthesized = function (ast) {
   this.appendKeyword('(');
   this.travel(ast.value);

test/main.test.js

@@ -377,5 +377,37 @@ describe('select grammar support', function () {
     testParser('select a from dual order by a desc limit 1, 1 union distinct select a from foo order by a limit 1');
   });
 
+  it ('intersect support', function () {
+    testParser('select a from dual intersect select a from foo;');
+  });
+
+  it ('intersect Parenthesized support', function () {
+    testParser('(select a from dual) intersect (select a from foo) order by a desc limit 100, 100;');
+  });
+
+  it ('intersect all support', function () {
+    testParser('(select a from dual) intersect all (select a from foo) order by a limit 100');
+  });
+
+  it ('intersect distinct support', function () {
+    testParser('select a from dual order by a desc limit 1, 1 intersect distinct select a from foo order by a limit 1');
+  });
+
+  it ('except support', function () {
+    testParser('select a from dual except select a from foo;');
+  });
+
+  it ('except Parenthesized support', function () {
+    testParser('(select a from dual) except (select a from foo) order by a desc limit 100, 100;');
+  });
+
+  it ('except all support', function () {
+    testParser('(select a from dual) except all (select a from foo) order by a limit 100');
+  });
+
+  it ('except distinct support', function () {
+    testParser('select a from dual order by a desc limit 1, 1 except distinct select a from foo order by a limit 1');
+  });
+
 });