Skip to content

Commit d22678a

Browse files
committed
Upgrade to JSqlParser 5.2.
Closes #3846
1 parent dbc1e46 commit d22678a

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
@@ -35,7 +35,7 @@
3535
<hsqldb>2.7.4</hsqldb>
3636
<h2>2.3.232</h2>
3737
<jakarta-persistence-api>3.2.0</jakarta-persistence-api>
38-
<jsqlparser>5.0</jsqlparser>
38+
<jsqlparser>5.2</jsqlparser>
3939
<mysql-connector-java>9.1.0</mysql-connector-java>
4040
<postgresql>42.7.4</postgresql>
4141
<oracle>23.7.0.25.01</oracle>

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
@@ -182,9 +182,9 @@ void withStatementsWorks() {
182182
assertThat(query.getProjection()).isEqualToIgnoringCase("day, value");
183183
assertThat(query.hasConstructorExpression()).isFalse();
184184

185-
assertThat(queryEnhancer.createCountQueryFor(null)).isEqualToIgnoringCase(
186-
"with sample_data (day, value) AS (VALUES ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))) "
187-
+ "SELECT count(1) FROM sample_data AS a");
185+
assertThat(queryEnhancer.createCountQueryFor(null).toLowerCase()).isEqualToIgnoringWhitespace(
186+
"with sample_data (day, value) as (values ((0, 13), (1, 12), (2, 15), (3, 4), (4, 8), (5, 16))) "
187+
+ "select count(1) from sample_data as a");
188188
assertThat(queryEnhancer.rewrite(getRewriteInformation(Sort.by("day").descending())))
189189
.endsWith("ORDER BY a.day DESC");
190190
assertThat(queryEnhancer.detectAlias()).isEqualToIgnoringCase("a");
@@ -205,9 +205,9 @@ void multipleWithStatementsWorks() {
205205
assertThat(query.getProjection()).isEqualToIgnoringCase("day, value");
206206
assertThat(query.hasConstructorExpression()).isFalse();
207207

208-
assertThat(queryEnhancer.createCountQueryFor(null)).isEqualToIgnoringCase(
209-
"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)) "
210-
+ "SELECT count(1) FROM sample_data AS a");
208+
assertThat(queryEnhancer.createCountQueryFor(null).toLowerCase()).isEqualToIgnoringWhitespace(
209+
"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)) "
210+
+ "select count(1) from sample_data as a");
211211
assertThat(queryEnhancer.rewrite(getRewriteInformation(Sort.by("day").descending())))
212212
.endsWith("ORDER BY a.day DESC");
213213
assertThat(queryEnhancer.detectAlias()).isEqualToIgnoringCase("a");

0 commit comments

Comments
 (0)