Resolve handling of ESCAPE clause with LIKE queries on Hibernate.

The HQL parser has to handle parameters in addition to character values in order to support SpEL. Closes #2954 Original Pull Request: #2956.
spring-projects · May 31, 2023 · 38ced42 · 38ced42
1 parent e0cfe41
commit 38ced42
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
@@ -579,7 +579,7 @@ dealingWithNullExpression
 
 // https://docs.jboss.org/hibernate/orm/6.1/userguide/html_single/Hibernate_User_Guide.html#hql-like-predicate
 stringPatternMatching
-    : expression NOT? (LIKE | ILIKE) expression (ESCAPE character)?
+    : expression NOT? (LIKE | ILIKE) expression (ESCAPE expression)?
     ;
 
 // https://docs.jboss.org/hibernate/orm/6.1/userguide/html_single/Hibernate_User_Guide.html#hql-elements-indices

diff --git a/...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java b/...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
@@ -2124,7 +2124,7 @@ public List<JpaQueryParsingToken> visitStringPatternMatching(HqlParser.StringPat
 		if (ctx.ESCAPE() != null) {
 
 			tokens.add(new JpaQueryParsingToken(ctx.ESCAPE()));
-			tokens.addAll(visit(ctx.character()));
+			tokens.addAll(visit(ctx.expression(2)));
 		}
 
 		return tokens;

diff --git a/...ta-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java b/...ta-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java
@@ -1206,6 +1206,12 @@ public List<JpaQueryParsingToken> visitLike_expression(JpqlParser.Like_expressio
 		tokens.add(new JpaQueryParsingToken(ctx.LIKE()));
 		tokens.addAll(visit(ctx.pattern_value()));
 
+		if (ctx.ESCAPE() != null) {
+
+			tokens.add(new JpaQueryParsingToken(ctx.ESCAPE()));
+			tokens.addAll(visit(ctx.escape_character()));
+		}
+
 		return tokens;
 	}
 

diff --git a/...st/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java b/...st/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java
@@ -34,4 +34,22 @@ void executesNotInQueryCorrectly() {}
 	@Disabled
 	@Override
 	void executesInKeywordForPageCorrectly() {}
+
+	@Disabled("Can't get ESCAPE clause working with EclipseLink. See #2955")
+	@Override
+	void escapingInLikeSpels() {
+		super.escapingInLikeSpels();
+	}
+
+	@Disabled("Can't get ESCAPE clause working with EclipseLink. See #2955")
+	@Override
+	void escapingInLikeSpelsInThePresenceOfEscapeCharacters() {
+		super.escapingInLikeSpelsInThePresenceOfEscapeCharacters();
+	}
+
+	@Disabled("Can't get ESCAPE clause working with EclipseLink. See #2955")
+	@Override
+	void escapingInLikeSpelsInThePresenceOfEscapedWildcards() {
+		super.escapingInLikeSpelsInThePresenceOfEscapedWildcards();
+	}
 }
diff --git a/...-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java b/...-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java
@@ -25,7 +25,6 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -235,7 +234,6 @@ void parametersForContainsGetProperlyEscaped() {
 				.isEmpty();
 	}
 
-	@Disabled("Can't get ESCAPE clause working with Hibernate")
 	@Test // DATAJPA-1519
 	void escapingInLikeSpels() {
 
@@ -246,7 +244,6 @@ void escapingInLikeSpels() {
 		assertThat(userRepository.findContainingEscaped("att_")).containsExactly(extra);
 	}
 
-	@Disabled("Can't get ESCAPE clause working with Hibernate")
 	@Test // DATAJPA-1522
 	void escapingInLikeSpelsInThePresenceOfEscapeCharacters() {
 
@@ -256,7 +253,6 @@ void escapingInLikeSpelsInThePresenceOfEscapeCharacters() {
 		assertThat(userRepository.findContainingEscaped("att\\x")).containsExactly(withEscapeCharacter);
 	}
 
-	@Disabled("Can't get ESCAPE clause working with Hibernate")
 	@Test // DATAJPA-1522
 	void escapingInLikeSpelsInThePresenceOfEscapedWildcards() {
 
@@ -288,8 +284,7 @@ void executesQueryWithProjectionContainingReferenceToPluralAttribute() {
 
 		List<RolesAndFirstname> rolesAndFirstnameBy = userRepository.findRolesAndFirstnameBy();
 
-		assertThat(rolesAndFirstnameBy)
-				.isNotNull();
+		assertThat(rolesAndFirstnameBy).isNotNull();
 
 		for (RolesAndFirstname rolesAndFirstname : rolesAndFirstnameBy) {
 			assertThat(rolesAndFirstname.getFirstname()).isNotNull();

diff --git a/...data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/...data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
@@ -625,7 +625,7 @@ List<User> findUsersByFirstnameForSpELExpressionWithParameterIndexOnlyWithEntity
 	List<NameOnlyDto> findByNamedQueryWithConstructorExpression();
 
 	// DATAJPA-1519
-	@Query("select u from User u where u.lastname like '%?#{escape([0])}%' escape ?#{escapeCharacter()}")
+	@Query("select u from User u where u.lastname like %?#{escape([0])}% escape ?#{escapeCharacter()}")
 	List<User> findContainingEscaped(String namePart);
 
 	// DATAJPA-1303