DATAJPA-1652: Using || (pipes) along with named parameters in custom queries raises an exception

Author: reta

src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java

@@ -89,8 +89,8 @@ public abstract class QueryUtils {
 	// Z Separator
 	// Cc Control
 	// Cf Format
-	// P Punctuation
-	private static final String IDENTIFIER = "[._[\\P{Z}&&\\P{Cc}&&\\P{Cf}&&\\P{P}]]+";
+	// Punct Punctuation
+	private static final String IDENTIFIER = "[._$#[\\P{Z}&&\\P{Cc}&&\\P{Cf}&&\\P{Punct}]]+";
 	static final String COLON_NO_DOUBLE_COLON = "(?<![:\\\\]):";
 	static final String IDENTIFIER_GROUP = String.format("(%s)", IDENTIFIER);
 

src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java

@@ -540,6 +540,34 @@ public void isNotDefaultProjection() {
 		softly.assertAll();
 	}
 
+	@Test // DATAJPA-1652
+	public void usingPipesWithNamedParameter() {
+
+		String queryString = "SELECT u FROM User u WHERE u.lastname LIKE '%'||:name||'%'";
+		StringQuery query = new StringQuery(queryString);
+
+		softly.assertThat(query.getQueryString()).isEqualTo(queryString);
+		softly.assertThat(query.hasParameterBindings()).isTrue();
+		softly.assertThat(query.getParameterBindings()).hasSize(1);
+		softly.assertThat(query.getParameterBindings().get(0).getName()).isEqualTo("name");
+
+		softly.assertAll();
+	}
+
+	@Test // DATAJPA-1652
+	public void usingGreaterThanWithNamedParameter() {
+
+		String queryString = "SELECT u FROM User u WHERE :age<u.age";
+		StringQuery query = new StringQuery(queryString);
+
+		softly.assertThat(query.getQueryString()).isEqualTo(queryString);
+		softly.assertThat(query.hasParameterBindings()).isTrue();
+		softly.assertThat(query.getParameterBindings()).hasSize(1);
+		softly.assertThat(query.getParameterBindings().get(0).getName()).isEqualTo("age");
+
+		softly.assertAll();
+	}
+
 	public void checkNumberOfNamedParameters(String query, int expectedSize, String label) {
 
 		DeclaredQuery declaredQuery = DeclaredQuery.of(query);