snuyanzin commented on code in PR #28290:
URL: https://github.com/apache/flink/pull/28290#discussion_r3448167458
##########
flink-table/flink-sql-parser/src/main/codegen/templates/Parser.jj:
##########
@@ -6428,59 +6441,56 @@ SqlNode BuiltinFunctionCall() :
<TRIM> {
SqlLiteral flag = null;
SqlNode trimChars = null;
+ SqlParserPos fromPos = SqlParserPos.ZERO;
s = span();
}
<LPAREN>
- [
- LOOKAHEAD(2)
- [
- <BOTH> {
- s.add(this);
- flag = SqlTrimFunction.Flag.BOTH.symbol(getPos());
- }
- |
- <TRAILING> {
- s.add(this);
- flag = SqlTrimFunction.Flag.TRAILING.symbol(getPos());
- }
- |
- <LEADING> {
- s.add(this);
- flag = SqlTrimFunction.Flag.LEADING.symbol(getPos());
- }
- ]
- [ trimChars = Expression(ExprContext.ACCEPT_SUB_QUERY) ]
+ (
(
- <FROM> {
- if (null == flag && null == trimChars) {
- throw SqlUtil.newContextException(getPos(),
- RESOURCE.illegalFromEmpty());
+ (
+ <BOTH> {
+ s.add(this);
+ flag = SqlTrimFunction.Flag.BOTH.symbol(getPos());
}
- }
- |
- <RPAREN> {
- // This is to handle the case of TRIM(x)
- // (FRG-191).
- if (flag == null) {
- flag =
SqlTrimFunction.Flag.BOTH.symbol(SqlParserPos.ZERO);
+ |
+ <TRAILING> {
+ s.add(this);
+ flag = SqlTrimFunction.Flag.TRAILING.symbol(getPos());
}
- args.add(flag);
- args.add(null); // no trim chars
- args.add(trimChars); // reinterpret trimChars as source
- return SqlStdOperatorTable.TRIM.createCall(s.end(this),
- args);
- }
+ |
+ <LEADING> {
+ s.add(this);
+ flag = SqlTrimFunction.Flag.LEADING.symbol(getPos());
+ }
+ )
+ (
+ <FROM> { fromPos = getPos() ;}
+ e = Expression(ExprContext.ACCEPT_SUB_QUERY)
+ |
+ e = Expression(ExprContext.ACCEPT_SUB_QUERY)
+ [
+ <FROM> { trimChars = e; fromPos = getPos(); }
+ e = Expression(ExprContext.ACCEPT_SUB_QUERY)
+ ]
+ )
Review Comment:
cherry-pick from https://issues.apache.org/jira/browse/CALCITE-7565
to fix regression of 1.39.0
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
