Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow count queries to start with whitespace.

Browse Source 
See #2393.
This commit is contained in:
Greg L. Turnquist
2022-04-14 09:03:12 -05:00
parent c053f08d65
commit 94e84cc8c4
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
View File

@@ -110,7 +110,8 @@ public abstract class QueryUtils {
private static final String EQUALS_CONDITION_STRING = "%s.%s = :%s";
private static final Pattern ORDER_BY = Pattern.compile("(order\\s+by\\s+)", CASE_INSENSITIVE);
private static final Pattern ORDER_BY_IN_WINDOW_OR_SUBSELECT = Pattern.compile("(\\(\\s*[a-z0-9 ,.*]*order\\s+by\\s+[a-z0-9 ,.]*\\s*\\))", CASE_INSENSITIVE);
private static final Pattern ORDER_BY_IN_WINDOW_OR_SUBSELECT = Pattern
.compile("(\\(\\s*[a-z0-9 ,.*]*order\\s+by\\s+[a-z0-9 ,.]*\\s*\\))", CASE_INSENSITIVE);
private static final Pattern NAMED_PARAMETER = Pattern.compile(COLON_NO_DOUBLE_COLON + IDENTIFIER + "|#" + IDENTIFIER,
CASE_INSENSITIVE);
@@ -144,6 +145,7 @@ public abstract class QueryUtils {
ALIAS_MATCH = compile(builder.toString(), CASE_INSENSITIVE);
builder = new StringBuilder();
builder.append("\\s*");
builder.append("(select\\s+((distinct)?((?s).+?)?)\\s+)?(from\\s+");
builder.append(IDENTIFIER);
builder.append("(?:\\s+as)?\\s+)");
@@ -279,8 +281,8 @@ public abstract class QueryUtils {
}
/**
* Returns {@code true} if the query has {@code order by} clause.
* The query has {@code order by} clause if there is an {@code order by} which is not part of window clause.
* Returns {@code true} if the query has {@code order by} clause. The query has {@code order by} clause if there is an
* {@code order by} which is not part of window clause.
*
* @param query the analysed query string
* @return {@code true} if the query has {@code order by} clause, {@code false} otherwise
@@ -297,9 +299,13 @@ public abstract class QueryUtils {
* @return the number of occurences of the pattern in the string
*/
private static int countOccurences(Pattern pattern, String string) {
Matcher matcher = pattern.matcher(string);
int occurences = 0;
while (matcher.find()) occurences++;
while (matcher.find()) {
occurences++;
}
return occurences;
}

10
spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
View File

@@ -550,6 +550,16 @@ class QueryUtilsUnitTests {
"select count(DISTINCT entity1) FROM Entity1 entity1 LEFT JOIN Entity2 entity2 ON entity1.key = entity2.key\nwhere entity1.id = 1799");
}
@Test // GH-2393
void createCountQueryStartsWithWhitespace() {
assertThat(createCountQueryFor(" \nselect * from User u where u.age > :age"))
.isEqualTo("select count(u) from User u where u.age > :age");
assertThat(createCountQueryFor(" \nselect u from User u where u.age > :age"))
.isEqualTo("select count(u) from User u where u.age > :age");
}
private static void assertCountQuery(String originalQuery, String countQuery) {
assertThat(createCountQueryFor(originalQuery)).isEqualTo(countQuery);
}