diff options
| author | Santiago M. Mola <santiago.mola@sap.com> | 2015-04-11 14:52:49 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2015-04-11 14:52:49 -0700 |
| commit | 5f7b7cdab41002ad291f0a1ba7777cfff21d0019 (patch) | |
| tree | 0a9b25404bce8732337ef1b0812dbe97afba2da7 /sql | |
| parent | 198cf2a3fa9babb5e8b7b44da0471b63b9f3ec04 (diff) | |
| download | spark-5f7b7cdab41002ad291f0a1ba7777cfff21d0019.tar.gz spark-5f7b7cdab41002ad291f0a1ba7777cfff21d0019.tar.bz2 spark-5f7b7cdab41002ad291f0a1ba7777cfff21d0019.zip | |
[SPARK-6611][SQL] Add support for INTEGER as synonym of INT.
https://issues.apache.org/jira/browse/SPARK-6611
Author: Santiago M. Mola <santiago.mola@sap.com>
Closes #5271 from smola/features/integer-parse and squashes the following commits:
f5c1c64 [Santiago M. Mola] [SPARK-6611] Add support for INTEGER as synonym of INT.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypeParser.scala | 2 | ||||
| -rw-r--r-- | sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeParserSuite.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypeParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypeParser.scala index 34270d0ca7..5163f05879 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypeParser.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypeParser.scala @@ -40,7 +40,7 @@ private[sql] trait DataTypeParser extends StandardTokenParsers { protected lazy val primitiveType: Parser[DataType] = "(?i)string".r ^^^ StringType | "(?i)float".r ^^^ FloatType | - "(?i)int".r ^^^ IntegerType | + "(?i)(?:int|integer)".r ^^^ IntegerType | "(?i)tinyint".r ^^^ ByteType | "(?i)smallint".r ^^^ ShortType | "(?i)double".r ^^^ DoubleType | diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeParserSuite.scala index 1ba21b6460..169125264a 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeParserSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeParserSuite.scala @@ -34,10 +34,12 @@ class DataTypeParserSuite extends FunSuite { } checkDataType("int", IntegerType) + checkDataType("integer", IntegerType) checkDataType("BooLean", BooleanType) checkDataType("tinYint", ByteType) checkDataType("smallINT", ShortType) checkDataType("INT", IntegerType) + checkDataType("INTEGER", IntegerType) checkDataType("bigint", LongType) checkDataType("float", FloatType) checkDataType("dOUBle", DoubleType) |