fix(parser): keep parenthesized multi-param lambda as first function arg (#2455)

* fix(parser): keep parenthesized multi-param lambda as first function arg

Signed-off-by: lisbon-craigb-13142 <lisbon-craigb-13142@users.noreply.github.com>

* fix(parser): keep parenthesized multi-param lambda as first function arg

Signed-off-by: lisbon-craigb-13142 <lisbon-craigb-13142@users.noreply.github.com>

* style: apply spotless wrapping in LambdaExpressionTest

Signed-off-by: ivanclarksoft <ivanclarksoft@users.noreply.github.com>

---------

Signed-off-by: lisbon-craigb-13142 <lisbon-craigb-13142@users.noreply.github.com>
Signed-off-by: ivanclarksoft <ivanclarksoft@users.noreply.github.com>
Co-authored-by: lisbon-craigb-13142 <lisbon-craigb-13142@users.noreply.github.com>
Co-authored-by: ivanclarksoft <ivanclarksoft@users.noreply.github.com>

Author: ivanclarksoft

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -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); } )*

src/test/java/net/sf/jsqlparser/expression/LambdaExpressionTest.java

@@ -41,7 +41,14 @@ void testLambdaMultiParameterIssue2030() throws JSQLParserException {
 
     @Test
     void testLambdaMultiParameterIssue2032() throws JSQLParserException {
-        String sqlStr = "SELECT  array_sort(array_agg(named_struct('depth', events_union.depth, 'eventtime',events_union.eventtime)), (left, right) -> case when(left.eventtime, left.depth) <(right.eventtime, right.depth) then -1 when(left.eventtime, left.depth) >(right.eventtime, right.depth) then 1 else 0 end) as col1 FROM your_table;";
+        String sqlStr =
+                "SELECT  array_sort(array_agg(named_struct('depth', events_union.depth, 'eventtime',events_union.eventtime)), (left, right) -> case when(left.eventtime, left.depth) <(right.eventtime, right.depth) then -1 when(left.eventtime, left.depth) >(right.eventtime, right.depth) then 1 else 0 end) as col1 FROM your_table;";
+        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);
     }