Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of EQL/JPQL using string literals and enums in IN items.

Browse Source 
Closes #3835
This commit is contained in:
Mark Paluch
2025-04-14 08:50:46 +02:00
parent ac4c6e6b9c
commit 3d39d6e811
6 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,7 +354,12 @@ in_expression
in_item
: literal
| string_expression
| boolean_literal
| numeric_literal
| date_time_timestamp_literal
| single_valued_input_parameter
| conditional_expression
;
like_expression

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

@@ -338,7 +338,12 @@ in_expression
in_item
: literal
| string_expression
| boolean_literal
| numeric_literal
| date_time_timestamp_literal
| single_valued_input_parameter
| conditional_expression
;
like_expression

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

@@ -1270,15 +1270,23 @@ class EqlQueryRenderer extends EqlBaseVisitor<List<JpaQueryParsingToken>> {
@Override
public List<JpaQueryParsingToken> visitIn_item(EqlParser.In_itemContext ctx) {
List<JpaQueryParsingToken> tokens = new ArrayList<>();
if (ctx.literal() != null) {
tokens.addAll(visit(ctx.literal()));
return visit(ctx.literal());
} else if (ctx.string_expression() != null) {
return visit(ctx.string_expression());
} else if (ctx.boolean_literal() != null) {
return visit(ctx.boolean_literal());
} else if (ctx.numeric_literal() != null) {
return visit(ctx.numeric_literal());
} else if (ctx.date_time_timestamp_literal() != null) {
return visit(ctx.date_time_timestamp_literal());
} else if (ctx.single_valued_input_parameter() != null) {
tokens.addAll(visit(ctx.single_valued_input_parameter()));
return visit(ctx.single_valued_input_parameter());
} else if (ctx.conditional_expression() != null) {
return visit(ctx.conditional_expression());
}
return tokens;
return new ArrayList<>();
}
@Override

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

@@ -1191,15 +1191,24 @@ class JpqlQueryRenderer extends JpqlBaseVisitor<List<JpaQueryParsingToken>> {
@Override
public List<JpaQueryParsingToken> visitIn_item(JpqlParser.In_itemContext ctx) {
List<JpaQueryParsingToken> tokens = new ArrayList<>();
if (ctx.literal() != null) {
tokens.addAll(visit(ctx.literal()));
return visit(ctx.literal());
} else if (ctx.string_expression() != null) {
return visit(ctx.string_expression());
} else if (ctx.boolean_literal() != null) {
return visit(ctx.boolean_literal());
} else if (ctx.numeric_literal() != null) {
return visit(ctx.numeric_literal());
} else if (ctx.date_time_timestamp_literal() != null) {
return visit(ctx.date_time_timestamp_literal());
} else if (ctx.single_valued_input_parameter() != null) {
tokens.addAll(visit(ctx.single_valued_input_parameter()));
return visit(ctx.single_valued_input_parameter());
} else if (ctx.conditional_expression() != null) {
return visit(ctx.conditional_expression());
}
return tokens;
return new ArrayList<>();
}
@Override

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

@@ -561,6 +561,18 @@ class EqlQueryRendererTests {
""");
}
@Test
void inClauseWithFunctionAndLiterals() {
assertQuery("""
select f from FooEntity f where upper(f.name) IN ('Y', 'Basic', 'Remit')
""");
assertQuery(
"""
select count(f) from FooEntity f where f.status IN (com.example.eql_bug_check.entity.FooStatus.FOO, com.example.eql_bug_check.entity.FooStatus.BAR)
""");
}
@Test
void notEqualsForTypeShouldWork() {

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

@@ -562,6 +562,18 @@ class JpqlQueryRendererTests {
""");
}
@Test
void inClauseWithFunctionAndLiterals() {
assertQuery("""
select f from FooEntity f where upper(f.name) IN ('Y', 'Basic', 'Remit')
""");
assertQuery(
"""
select count(f) from FooEntity f where f.status IN (com.example.eql_bug_check.entity.FooStatus.FOO, com.example.eql_bug_check.entity.FooStatus.BAR)
""");
}
@Test
void notEqualsForTypeShouldWork() {