Accept functions and paths with reserved words (string expressions) in EQL IN expressions.

Closes #3834

Author: mp911de

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

@@ -349,7 +349,7 @@ between_expression
     ;
 
 in_expression
-    : (state_valued_path_expression | type_discriminator) (NOT)? IN (('(' in_item (',' in_item)* ')') | ( '(' subquery ')') | collection_valued_input_parameter)
+    : (string_expression | type_discriminator) (NOT)? IN (('(' in_item (',' in_item)* ')') | ( '(' subquery ')') | collection_valued_input_parameter)
     ;
 
 in_item

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

@@ -333,7 +333,7 @@ between_expression
     ;
 
 in_expression
-    : (state_valued_path_expression | type_discriminator) (NOT)? IN (('(' in_item (',' in_item)* ')') | ( '(' subquery ')') | collection_valued_input_parameter)
+    : (string_expression | type_discriminator) (NOT)? IN (('(' in_item (',' in_item)* ')') | ( '(' subquery ')') | collection_valued_input_parameter)
     ;
 
 in_item

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

@@ -1228,8 +1228,8 @@ public List<JpaQueryParsingToken> visitIn_expression(EqlParser.In_expressionCont
 
 		List<JpaQueryParsingToken> tokens = new ArrayList<>();
 
-		if (ctx.state_valued_path_expression() != null) {
-			tokens.addAll(visit(ctx.state_valued_path_expression()));
+		if (ctx.string_expression() != null) {
+			tokens.addAll(visit(ctx.string_expression()));
 		}
 		if (ctx.type_discriminator() != null) {
 			tokens.addAll(visit(ctx.type_discriminator()));

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

@@ -1149,8 +1149,8 @@ public List<JpaQueryParsingToken> visitIn_expression(JpqlParser.In_expressionCon
 
 		List<JpaQueryParsingToken> tokens = new ArrayList<>();
 
-		if (ctx.state_valued_path_expression() != null) {
-			tokens.addAll(visit(ctx.state_valued_path_expression()));
+		if (ctx.string_expression() != null) {
+			tokens.addAll(visit(ctx.string_expression()));
 		}
 		if (ctx.type_discriminator() != null) {
 			tokens.addAll(visit(ctx.type_discriminator()));

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

@@ -37,6 +37,7 @@
  *
  * @author Greg Turnquist
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 class EqlQueryRendererTests {
 
@@ -1032,12 +1033,14 @@ void lateralShouldBeAValidParameter() {
 		assertQuery("select te from TestEntity te where te.lateral = :lateral");
 	}
 
-	@Test
+	@Test // GH-3834
 	void reservedWordsShouldWork() {
 
 		assertQuery("select ie from ItemExample ie left join ie.object io where io.externalId = :externalId");
 		assertQuery("select ie.object from ItemExample ie left join ie.object io where io.externalId = :externalId");
 		assertQuery("select ie from ItemExample ie left join ie.object io where io.object = :externalId");
 		assertQuery("select ie from ItemExample ie where ie.status = com.app.domain.object.Status.UP");
+		assertQuery("select f from FooEntity f where upper(f.name) IN :names");
+		assertQuery("select f from FooEntity f where f.size IN :sizes");
 	}
 }

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

@@ -37,6 +37,7 @@
  *
  * @author Greg Turnquist
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 3.1
  */
 class JpqlQueryRendererTests {
@@ -1033,7 +1034,7 @@ void entityNameWithPackageContainingReservedWord(String reservedWord) {
 		assertQuery(source);
 	}
 
-	@Test
+	@Test // GH-3834
 	void reservedWordsShouldWork() {
 
 		assertQuery("select ie from ItemExample ie left join ie.object io where io.externalId = :externalId");