From 3084969a5603ae2e6f21abea567c62313619b929 Mon Sep 17 00:00:00 2001
From: reta <drreta@gmail.com>
Date: Sat, 28 Dec 2019 16:48:06 -0500
Subject: [PATCH 1/2] DATAJPA-1652: Using || (pipes) along with named
 parameters in custom queries raises an exception

---
 .../data/jpa/repository/query/QueryUtils.java |  4 +--
 .../query/StringQueryUnitTests.java           | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
index 589ab4f73e..20f509539b 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
+++ b/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);
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
index 6dd4f561a0..a729291b35 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
+++ b/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);

From 71ba560adc66362bb601ea86cfa7320eb19de9b3 Mon Sep 17 00:00:00 2001
From: reta <drreta@gmail.com>
Date: Mon, 6 Jan 2020 21:32:24 -0500
Subject: [PATCH 2/2] DATAJPA-1652: Addressing code review comments

---
 .../springframework/data/jpa/repository/query/QueryUtils.java  | 3 ++-
 .../data/jpa/repository/query/StringQueryUnitTests.java        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
index 20f509539b..390686cc4e 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
@@ -79,6 +79,7 @@
  * @author Florian Lüdiger
  * @author Grégoire Druant
  * @author Mohammad Hewedy
+ * @author Andriy Redko
  */
 public abstract class QueryUtils {
 
@@ -90,7 +91,7 @@ public abstract class QueryUtils {
 	// Cc Control
 	// Cf Format
 	// Punct Punctuation
-	private static final String IDENTIFIER = "[._$#[\\P{Z}&&\\P{Cc}&&\\P{Cf}&&\\P{Punct}]]+";
+	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);
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
index a729291b35..02c5f6b067 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java
@@ -37,6 +37,7 @@
  * @author Thomas Darimont
  * @author Jens Schauder
  * @author Nils Borrmann
+ * @author Andriy Redko
  */
 public class StringQueryUnitTests {
 
@@ -557,7 +558,7 @@ public void usingPipesWithNamedParameter() {
 	@Test // DATAJPA-1652
 	public void usingGreaterThanWithNamedParameter() {
 
-		String queryString = "SELECT u FROM User u WHERE :age<u.age";
+		String queryString = "SELECT u FROM User u WHERE :age>u.age";
 		StringQuery query = new StringQuery(queryString);
 
 		softly.assertThat(query.getQueryString()).isEqualTo(queryString);