Fix EQL and JPQL LIKE with ESCAPE clause parsing.

Closes #3873

Author: mp911de

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

@@ -709,7 +709,8 @@ entity_type_literal
 
 escape_character
     : CHARACTER
-    | character_valued_input_parameter //
+    | string_literal
+    | character_valued_input_parameter
     ;
 
 numeric_literal

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

@@ -695,7 +695,8 @@ entity_type_literal
 
 escape_character
     : CHARACTER
-    | character_valued_input_parameter //
+    | string_literal
+    | character_valued_input_parameter
     ;
 
 numeric_literal

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

@@ -2336,7 +2336,16 @@ public QueryTokenStream visitEntity_type_literal(EqlParser.Entity_type_literalCo
 
 	@Override
 	public QueryTokenStream visitEscape_character(EqlParser.Escape_characterContext ctx) {
-		return QueryTokenStream.ofToken(ctx.CHARACTER());
+
+		if (ctx.CHARACTER() != null) {
+			return QueryTokenStream.ofToken(ctx.CHARACTER());
+		} else if (ctx.character_valued_input_parameter() != null) {
+			return visit(ctx.character_valued_input_parameter());
+		} else if (ctx.string_literal() != null) {
+			return visit(ctx.string_literal());
+		}
+
+		return QueryTokenStream.empty();
 	}
 
 	@Override

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

@@ -2298,7 +2298,16 @@ public QueryTokenStream visitEntity_type_literal(JpqlParser.Entity_type_literalC
 
 	@Override
 	public QueryTokenStream visitEscape_character(JpqlParser.Escape_characterContext ctx) {
-		return QueryTokenStream.ofToken(ctx.CHARACTER());
+
+		if (ctx.CHARACTER() != null) {
+			return QueryTokenStream.ofToken(ctx.CHARACTER());
+		} else if (ctx.character_valued_input_parameter() != null) {
+			return visit(ctx.character_valued_input_parameter());
+		} else if (ctx.string_literal() != null) {
+			return visit(ctx.string_literal());
+		}
+
+		return QueryTokenStream.empty();
 	}
 
 	@Override

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

@@ -1136,6 +1136,14 @@ void signedExpressionsShouldWork(String query) {
 		assertQuery(query);
 	}
 
+	@Test // GH-3873
+	void escapeClauseShouldWork() {
+		assertQuery("select t.name from SomeDbo t where t.name LIKE :name escape '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE ?1");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE :param");
+	}
+
 	@ParameterizedTest // GH-3451
 	@MethodSource("reservedWords")
 	void entityNameWithPackageContainingReservedWord(String reservedWord) {

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

@@ -19,9 +19,6 @@
 
 import java.util.stream.Stream;
 
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -2170,6 +2167,9 @@ void binaryLiteralsShouldWork() {
 	@Test // GH-3040
 	void escapeClauseShouldWork() {
 		assertQuery("select t.name from SomeDbo t where t.name LIKE :name escape '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE ?1");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE :param");
 	}
 
 	@Test // GH-3062, GH-3056

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

@@ -1394,6 +1394,14 @@ void signedExpressionsShouldWork(String query) {
 		assertQuery(query);
 	}
 
+	@Test // GH-3873
+	void escapeClauseShouldWork() {
+		assertQuery("select t.name from SomeDbo t where t.name LIKE :name escape '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE '\\\\'");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE ?1");
+		assertQuery("SELECT e FROM SampleEntity e WHERE LOWER(e.label) LIKE LOWER(?1) ESCAPE :param");
+	}
+
 	@ParameterizedTest // GH-3451
 	@MethodSource("reservedWords")
 	void entityNameWithPackageContainingReservedWord(String reservedWord) {