update SqlParser on masterbranch

YanjieGao · YanjieGao · commit 9847dcf13899 · 2014-07-01T11:18:19.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -133,7 +133,7 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
   protected val TRUE = Keyword("TRUE")
   protected val UNION = Keyword("UNION")
   protected val WHERE = Keyword("WHERE")
-   protected val WHERE = Keyword("EXCEPT")
+  protected val WHERE = Keyword("EXCEPT")
 
 
   // Use reflection to find the reserved words defined in this class.
@@ -170,6 +170,7 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
   protected lazy val query: Parser[LogicalPlan] =
     select * (
       UNION ~ ALL ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Union(q1, q2) } |
+      EXCEPT ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Except(q1, q2)} |
       UNION ~ opt(DISTINCT) ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Distinct(Union(q1, q2)) }
     ) | insert
 
