Add DataType for SqlParser

andrewor14 · Apr 3, 2014 · 8a1d4d6 · 8a1d4d6
1 parent ce4385e
commit 8a1d4d6
Showing 1 changed file with 21 additions and 1 deletion.
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
@@ -122,6 +122,16 @@ class SqlParser extends StandardTokenParsers {
   protected val RIGHT = Keyword("RIGHT")
   protected val SELECT = Keyword("SELECT")
   protected val STRING = Keyword("STRING")
+  protected val FLOAT = Keyword("FLOAT")
+  protected val SMALLINT = Keyword("SMALLINT")
+  protected val TINYINT = Keyword("TINYINT")
+  protected val INT = Keyword("INT")
+  protected val BIGINT = Keyword("BIGINT")
+  protected val DECIMAL = Keyword("DECIMAL")
+  protected val DOUBLE = Keyword("DOUBLE")
+  protected val BOOLEAN = Keyword("BOOLEAN")
+  protected val BINARY = Keyword("BINARY")
+  protected val TIMESTAMP = Keyword("TIMESTAMP")
   protected val SUM = Keyword("SUM")
   protected val TRUE = Keyword("TRUE")
   protected val UNION = Keyword("UNION")
@@ -338,5 +348,15 @@ class SqlParser extends StandardTokenParsers {
     literal
 
   protected lazy val dataType: Parser[DataType] =
-    STRING ^^^ StringType
+    STRING ^^^ StringType |
+    FLOAT ^^^ FloatType |
+    TINYINT ^^^ ByteType |
+    SMALLINT ^^^ ShortType |
+    INT ^^^ IntegerType |
+    BIGINT ^^^ LongType |
+    DECIMAL ^^^ DecimalType |
+    DOUBLE ^^^ DoubleType |
+    BOOLEAN ^^^ BooleanType |
+    BINARY ^^^ BinaryType |
+    TIMESTAMP ^^^ TimestampType
 }