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

@@ -688,7 +688,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

@@ -674,7 +674,8 @@ entity_type_literal
 
 escape_character
     : CHARACTER
-    | character_valued_input_parameter //
+    | string_literal
+    | character_valued_input_parameter
     ;
 
 numeric_literal
@@ -982,7 +983,7 @@ NOT_EQUAL                   : '<>' | '!=' ;
 
 CHARACTER                   : '\'' (~ ('\'' | '\\')) '\'' ;
 IDENTIFICATION_VARIABLE     : ('a' .. 'z' | 'A' .. 'Z' | '\u0080' .. '\ufffe' | '$' | '_') ('a' .. 'z' | 'A' .. 'Z' | '\u0080' .. '\ufffe' | '0' .. '9' | '$' | '_')* ;
-STRINGLITERAL               : '\'' (~ ('\'' | '\\'))* '\'' ;
+STRINGLITERAL               : '\'' (~ ('\'' | '\\')|'\\')* '\'' ;
 JAVASTRINGLITERAL           : '"' ( ('\\' [btnfr"']) | ~('"'))* '"';
 FLOATLITERAL                : ('0' .. '9')* '.' ('0' .. '9')+ (E ('0' .. '9')+)* (F|D)?;
 INTLITERAL                  : ('0' .. '9')+ ;

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

@@ -2309,7 +2309,16 @@ public QueryTokenStream visitEntity_type_literal(EqlParser.Entity_type_literalCo
 
 	@Override
 	public QueryTokenStream visitEscape_character(EqlParser.Escape_characterContext ctx) {
-		return QueryRendererBuilder.from(QueryTokens.token(ctx.CHARACTER()));
+
+		if (ctx.CHARACTER() != null) {
+			return QueryRendererBuilder.from(QueryTokens.token(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

@@ -2182,7 +2182,16 @@ public QueryTokenStream visitEntity_type_literal(JpqlParser.Entity_type_literalC
 
 	@Override
 	public QueryTokenStream visitEscape_character(JpqlParser.Escape_characterContext ctx) {
-		return QueryRenderer.from(QueryTokens.expression(ctx.CHARACTER()));
+
+		if (ctx.CHARACTER() != null) {
+			return QueryRenderer.from(QueryTokens.expression(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

@@ -1056,6 +1056,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

@@ -1801,6 +1801,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

@@ -1049,6 +1049,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) {