Fix nested EQL and JPQL aggregation function argument grammar.

We now accept a wider range of function arguments instead of limiting to property paths.

Closes #4013

Author: mp911de

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Eql.g4

@@ -219,8 +219,8 @@ constructor_item
     ;
 
 aggregate_expression
-    : (AVG | MAX | MIN | SUM) '(' (DISTINCT)? state_valued_path_expression ')'
-    | COUNT '(' (DISTINCT)? (identification_variable | state_valued_path_expression | single_valued_object_path_expression) ')'
+    : (AVG | MAX | MIN | SUM) '(' (DISTINCT)? simple_select_expression ')'
+    | COUNT '(' (DISTINCT)? simple_select_expression ')'
     | function_invocation
     ;
 
@@ -593,10 +593,7 @@ datetime_part
     ;
 
 function_arg
-    : literal
-    | state_valued_path_expression
-    | input_parameter
-    | scalar_expression
+    : simple_select_expression
     ;
 
 case_expression

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4

@@ -220,8 +220,8 @@ constructor_item
     ;
 
 aggregate_expression
-    : (AVG | MAX | MIN | SUM) '(' (DISTINCT)? state_valued_path_expression ')'
-    | COUNT '(' (DISTINCT)? (identification_variable | state_valued_path_expression | single_valued_object_path_expression) ')'
+    : (AVG | MAX | MIN | SUM) '(' (DISTINCT)? simple_select_expression ')'
+    | COUNT '(' (DISTINCT)? simple_select_expression ')'
     | function_invocation
     ;
 
@@ -593,10 +593,7 @@ datetime_part
     ;
 
 function_arg
-    : literal
-    | state_valued_path_expression
-    | input_parameter
-    | scalar_expression
+    : simple_select_expression
     ;
 
 case_expression

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/EqlQueryRenderer.java

@@ -494,7 +494,7 @@ public QueryTokenStream visitAggregate_expression(EqlParser.Aggregate_expression
 				builder.append(QueryTokens.expression(ctx.DISTINCT()));
 			}
 
-			builder.appendInline(visit(ctx.state_valued_path_expression()));
+			builder.appendInline(visit(ctx.simple_select_expression()));
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else if (ctx.COUNT() != null) {
 
@@ -503,13 +503,7 @@ public QueryTokenStream visitAggregate_expression(EqlParser.Aggregate_expression
 			if (ctx.DISTINCT() != null) {
 				builder.append(QueryTokens.expression(ctx.DISTINCT()));
 			}
-			if (ctx.identification_variable() != null) {
-				builder.appendInline(visit(ctx.identification_variable()));
-			} else if (ctx.state_valued_path_expression() != null) {
-				builder.appendInline(visit(ctx.state_valued_path_expression()));
-			} else if (ctx.single_valued_object_path_expression() != null) {
-				builder.appendInline(visit(ctx.single_valued_object_path_expression()));
-			}
+			builder.appendInline(visit(ctx.simple_select_expression()));
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else if (ctx.function_invocation() != null) {
 			builder.append(visit(ctx.function_invocation()));

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java

@@ -495,7 +495,7 @@ public QueryTokenStream visitAggregate_expression(JpqlParser.Aggregate_expressio
 				builder.append(QueryTokens.expression(ctx.DISTINCT()));
 			}
 
-			builder.appendInline(visit(ctx.state_valued_path_expression()));
+			builder.appendInline(visit(ctx.simple_select_expression()));
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else if (ctx.COUNT() != null) {
 
@@ -504,13 +504,8 @@ public QueryTokenStream visitAggregate_expression(JpqlParser.Aggregate_expressio
 			if (ctx.DISTINCT() != null) {
 				builder.append(QueryTokens.expression(ctx.DISTINCT()));
 			}
-			if (ctx.identification_variable() != null) {
-				builder.appendInline(visit(ctx.identification_variable()));
-			} else if (ctx.state_valued_path_expression() != null) {
-				builder.appendInline(visit(ctx.state_valued_path_expression()));
-			} else if (ctx.single_valued_object_path_expression() != null) {
-				builder.appendInline(visit(ctx.single_valued_object_path_expression()));
-			}
+
+			builder.appendInline(visit(ctx.simple_select_expression()));
 			builder.append(TOKEN_CLOSE_PAREN);
 		} else if (ctx.function_invocation() != null) {
 			builder.append(visit(ctx.function_invocation()));

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java

@@ -1254,6 +1254,14 @@ void findOrdersThatHaveProductNamedByAParameter() {
 				""");
 	}
 
+	@Test // GH-4013
+	void minMaxFunctionsShouldWork() {
+		assertQuery("SELECT MAX(e.age), e.address.city FROM Employee e");
+		assertQuery("SELECT MAX(1), e.address.city FROM Employee e");
+		assertQuery("SELECT MAX(MIN(MOD(e.salary, 10))), e.address.city FROM Employee e");
+		assertQuery("SELECT MIN(MOD(e.salary, 10)), e.address.city FROM Employee e");
+	}
+
 	@Test // GH-2982
 	void floorShouldBeValidEntityName() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java

@@ -2080,6 +2080,12 @@ void lnFunctionShouldWork() {
 		assertQuery("select ln(7.5) from Element a");
 	}
 
+	@Test // GH-4013
+	void minMaxFunctionsShouldWork() {
+		assertQuery("SELECT MAX(MIN(MOD(e.salary, 10))), e.address.city FROM Employee e");
+		assertQuery("SELECT MIN(MOD(e.salary, 10)), e.address.city FROM Employee e");
+	}
+
 	@Test // GH-2981
 	void cteWithClauseShouldWork() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java

@@ -1260,6 +1260,14 @@ void findOrdersThatHaveProductNamedByAParameter() {
 				""");
 	}
 
+	@Test // GH-4013
+	void minMaxFunctionsShouldWork() {
+		assertQuery("SELECT MAX(e.age), e.address.city FROM Employee e");
+		assertQuery("SELECT MAX(1), e.address.city FROM Employee e");
+		assertQuery("SELECT MAX(MIN(MOD(e.salary, 10))), e.address.city FROM Employee e");
+		assertQuery("SELECT MIN(MOD(e.salary, 10)), e.address.city FROM Employee e");
+	}
+
 	@Test // GH-2982
 	void floorShouldBeValidEntityName() {