Skip to content

Commit 4034710

Browse files
committed
Upgrade to JSqlParser 5.2.
Closes #3846
1 parent 5e3b590 commit 4034710

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<hsqldb>2.7.4</hsqldb>
3939
<h2>2.3.232</h2>
4040
<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
41-
<jsqlparser>5.0</jsqlparser>
41+
<jsqlparser>5.2</jsqlparser>
4242
<mysql-connector-java>9.2.0</mysql-connector-java>
4343
<postgresql>42.7.5</postgresql>
4444
<springdata.commons>3.5.0-SNAPSHOT</springdata.commons>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ void withStatementsWorks() {
180180
assertThat(stringQuery.getProjection()).isEqualToIgnoringCase("day, value");
181181
assertThat(stringQuery.hasConstructorExpression()).isFalse();
182182

183-
assertThat(queryEnhancer.createCountQueryFor()).isEqualToIgnoringCase(
184-
"with sample_data (day, value) AS (VALUES ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))) "
185-
+ "SELECT count(1) FROM sample_data AS a");
183+
assertThat(queryEnhancer.createCountQueryFor().toLowerCase()).isEqualToIgnoringWhitespace(
184+
"with sample_data (day, value) as (values ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))) "
185+
+ "select count(1) from sample_data as a");
186186
assertThat(queryEnhancer.applySorting(Sort.by("day").descending())).endsWith("ORDER BY a.day DESC");
187187
assertThat(queryEnhancer.getJoinAliases()).isEmpty();
188188
assertThat(queryEnhancer.detectAlias()).isEqualToIgnoringCase("a");
@@ -203,9 +203,9 @@ void multipleWithStatementsWorks() {
203203
assertThat(stringQuery.getProjection()).isEqualToIgnoringCase("day, value");
204204
assertThat(stringQuery.hasConstructorExpression()).isFalse();
205205

206-
assertThat(queryEnhancer.createCountQueryFor()).isEqualToIgnoringCase(
207-
"with sample_data (day, value) AS (VALUES ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))), test2 AS (VALUES (1, 2, 3)) "
208-
+ "SELECT count(1) FROM sample_data AS a");
206+
assertThat(queryEnhancer.createCountQueryFor().toLowerCase()).isEqualToIgnoringWhitespace(
207+
"with sample_data (day, value) as (values ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))), test2 as (values (1, 2, 3)) "
208+
+ "select count(1) from sample_data as a");
209209
assertThat(queryEnhancer.applySorting(Sort.by("day").descending())).endsWith("ORDER BY a.day DESC");
210210
assertThat(queryEnhancer.getJoinAliases()).isEmpty();
211211
assertThat(queryEnhancer.detectAlias()).isEqualToIgnoringCase("a");

0 commit comments

Comments
 (0)