diff options
author | Michael Armbrust <michael@databricks.com> | 2015-02-24 10:49:51 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-02-24 10:49:51 -0800 |
commit | 0a59e45e2f2e6f00ccd5f10c79f629fb796fd8d0 (patch) | |
tree | 57d70a6d009bb5f9144534b2bf5e69f6dd8b5e90 /sql | |
parent | 840333133396d443e747f62fce9967f7681fb276 (diff) | |
download | spark-0a59e45e2f2e6f00ccd5f10c79f629fb796fd8d0.tar.gz spark-0a59e45e2f2e6f00ccd5f10c79f629fb796fd8d0.tar.bz2 spark-0a59e45e2f2e6f00ccd5f10c79f629fb796fd8d0.zip |
[SPARK-5910][SQL] Support for as in selectExpr
Author: Michael Armbrust <michael@databricks.com>
Closes #4736 from marmbrus/asExprs and squashes the following commits:
5ba97e4 [Michael Armbrust] [SPARK-5910][SQL] Support for as in selectExpr
Diffstat (limited to 'sql')
-rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala | 2 | ||||
-rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala | 6 |
2 files changed, 7 insertions, 1 deletions
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 index b16aff99af..c363a5efac 100644 --- 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 @@ -40,7 +40,7 @@ class SqlParser extends AbstractSparkSQLParser { def parseExpression(input: String): Expression = { // Initialize the Keywords. lexical.initialize(reservedWords) - phrase(expression)(new lexical.Scanner(input)) match { + phrase(projection)(new lexical.Scanner(input)) match { case Success(plan, _) => plan case failureOrError => sys.error(failureOrError.toString) } diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala index 6b9b3a8425..e71e9bee3a 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala @@ -130,6 +130,12 @@ class DataFrameSuite extends QueryTest { testData.collect().map(row => Row(math.abs(row.getInt(0)), row.getString(1))).toSeq) } + test("selectExpr with alias") { + checkAnswer( + testData.selectExpr("key as k").select("k"), + testData.select("key").collect().toSeq) + } + test("filterExpr") { checkAnswer( testData.filter("key > 90"), |