You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2019/01/08 10:38:46 UTC
[flink] branch master updated: [FLINK-11279] [table] Fix week
interval parsing in ExpressionParser
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 90f3b42 [FLINK-11279] [table] Fix week interval parsing in ExpressionParser
90f3b42 is described below
commit 90f3b424c74b3673f90093acc8384acf1ef69f74
Author: XuQianJin-Stars <x1...@163.com>
AuthorDate: Tue Jan 8 12:45:26 2019 +0800
[FLINK-11279] [table] Fix week interval parsing in ExpressionParser
This closes #7426.
---
.../scala/org/apache/flink/table/expressions/ExpressionParser.scala | 2 +-
.../org/apache/flink/table/expressions/ScalarFunctionsTest.scala | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
index d5d64b4..b45ce80 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/expressions/ExpressionParser.scala
@@ -303,7 +303,7 @@ object ExpressionParser extends JavaTokenParsers with PackratParsers {
case expr ~ _ ~ (MONTHS.key | MONTH.key) => toMonthInterval(expr, 1)
- case expr ~ _ ~ (WEEKS.key | WEEKS.key) => toMilliInterval(expr, 7 * MILLIS_PER_DAY)
+ case expr ~ _ ~ (WEEKS.key | WEEK.key) => toMilliInterval(expr, 7 * MILLIS_PER_DAY)
case expr ~ _ ~ (DAYS.key | DAY.key) => toMilliInterval(expr, MILLIS_PER_DAY)
diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
index 31c9b6c..23bd2ae 100644
--- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
+++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/expressions/ScalarFunctionsTest.scala
@@ -2764,6 +2764,11 @@ class ScalarFunctionsTest extends ScalarTypesTestBase {
"'2016-03-31'.toDate - 1.month",
"timestampadd(MONTH, -1, date '2016-03-31')",
"2016-02-29")
+
+ testAllApis("2016-03-31".toDate - 1.week,
+ "'2016-03-31'.toDate - 1.week",
+ "timestampadd(WEEK, -1, date '2016-03-31')",
+ "2016-03-24")
}
// ----------------------------------------------------------------------------------------------