asfgit closed pull request #7426: [FLINK-11279][Table API & SQL]The bug of
Error parsing ExpressionParser
URL: https://github.com/apache/flink/pull/7426
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 d5d64b48d69..b45ce801018 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 31c9b6c3d01..23bd2ae3379 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")
}
//
----------------------------------------------------------------------------------------------
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
