From 1f2e4a179a0d703872d57f09c8a459c1fdb37349 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 4 May 2022 10:31:48 -0500 Subject: [PATCH] Polishing. See #2514. --- .../jpa/repository/query/QueryEnhancerUnitTests.java | 9 ++++----- .../data/jpa/repository/query/QueryUtilsUnitTests.java | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java index 1b56f3629..c181425f1 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java @@ -712,26 +712,25 @@ class QueryEnhancerUnitTests { assertThat(result).containsIgnoringCase("order by dd.institutesIds"); } - - @Test //GH-2511 + @Test // GH-2511 void countQueryUsesCorrectVariable() { + StringQuery nativeQuery = new StringQuery("SELECT * FROM User WHERE created_at > $1", true); QueryEnhancer queryEnhancer = getEnhancer(nativeQuery); String countQueryFor = queryEnhancer.createCountQueryFor(); assertThat(countQueryFor).isEqualTo("SELECT count(*) FROM User WHERE created_at > $1"); - nativeQuery = new StringQuery("SELECT * FROM (select * from test) ",true); + nativeQuery = new StringQuery("SELECT * FROM (select * from test) ", true); queryEnhancer = getEnhancer(nativeQuery); countQueryFor = queryEnhancer.createCountQueryFor(); assertThat(countQueryFor).isEqualTo("SELECT count(*) FROM (SELECT * FROM test)"); - nativeQuery = new StringQuery("SELECT * FROM (select * from test) as test",true); + nativeQuery = new StringQuery("SELECT * FROM (select * from test) as test", true); queryEnhancer = getEnhancer(nativeQuery); countQueryFor = queryEnhancer.createCountQueryFor(); assertThat(countQueryFor).isEqualTo("SELECT count(test) FROM (SELECT * FROM test) AS test"); } - public static Stream detectsJoinAliasesCorrectlySource() { return Stream.of( // diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java index e6a9a3f4b..3da2af35f 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java @@ -638,8 +638,9 @@ class QueryUtilsUnitTests { "select * from (select * from user order by 1, 2, 3 desc limit 10) u order by u.active asc, age desc"); } - @Test //GH-2511 + @Test // GH-2511 void countQueryUsesCorrectVariable() { + String countQueryFor = createCountQueryFor("SELECT * FROM User WHERE created_at > $1"); assertThat(countQueryFor).isEqualTo("select count(*) FROM User WHERE created_at > $1");