diff options
author | Michael Armbrust <michael@databricks.com> | 2014-06-05 17:42:08 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-06-05 17:42:08 -0700 |
commit | c7a183b2c2bca13565496495b4ae3a3a9f63f9ab (patch) | |
tree | eb36bdc8caf9c002025ae1165674a89338294787 /sql/core | |
parent | 668cb1defe735add91f4a5b7b8ebe7cfd5640b25 (diff) | |
download | spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.tar.gz spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.tar.bz2 spark-c7a183b2c2bca13565496495b4ae3a3a9f63f9ab.zip |
[SPARK-2041][SQL] Correctly analyze queries where columnName == tableName.
Author: Michael Armbrust <michael@databricks.com>
Closes #985 from marmbrus/tableName and squashes the following commits:
3caaa27 [Michael Armbrust] Correctly analyze queries where columnName == tableName.
Diffstat (limited to 'sql/core')
-rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 6 | ||||
-rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/TestData.scala | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala index e2ad3915d3..aa0c426f6f 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala @@ -28,6 +28,12 @@ class SQLQuerySuite extends QueryTest { // Make sure the tables are loaded. TestData + test("SPARK-2041 column name equals tablename") { + checkAnswer( + sql("SELECT tableName FROM tableName"), + "test") + } + test("index into array") { checkAnswer( sql("SELECT data, data[0], data[0] + data[1], data[0 + 1] FROM arrayData"), diff --git a/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala b/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala index 876bd1636a..05de736bbc 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala @@ -114,4 +114,7 @@ object TestData { NullStrings(2, "ABC") :: NullStrings(3, null) :: Nil) nullStrings.registerAsTable("nullStrings") + + case class TableName(tableName: String) + TestSQLContext.sparkContext.parallelize(TableName("test") :: Nil).registerAsTable("tableName") } |