Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -7885,22 +7885,22 @@ Expression PrimaryExpression() #PrimaryExpression:
list=ParenthesedExpressionList()
// Mutli-Variable Lambda Expression, e. g.
// SELECT map_filter(my_column, (k,v) -> v.my_inner_column = 'some_value')
[ LOOKAHEAD(2) "->"
retval = Expression()
{
retval = LambdaExpression.from(list, retval);
}
]


{
if (list.size() == 1) {
retval = new ParenthesedExpressionList( (Expression) list.getExpressions().get(0));
} else {
retval = list;
// First-arg form (issue #2195): array_map((x,y,z) -> x + y, ...)
(
LOOKAHEAD(2) "->"
retval = Expression()
{
retval = LambdaExpression.from(list, retval);
}
|
{
if (list.size() == 1) {
retval = new ParenthesedExpressionList( (Expression) list.getExpressions().get(0));
} else {
retval = list;
}
}
}

)

// RowGet Expressions
( LOOKAHEAD(2) "." tmp=RelObjectName() { retval = new RowGetExpression(retval, tmp); } )*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,10 @@ void testLambdaMultiParameterIssue2032() throws JSQLParserException {
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}

@Test
void testLambdaFirstArgumentIssue2195() throws JSQLParserException {
String sqlStr = "select array_map((x,y,z) -> x + y, [1], [2], [4]) FROM table_name";
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}

}