From 235a6d3397622ef9f27a4e36cb56658a4decdde8 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Tue, 23 May 2023 07:40:04 -0500 Subject: [PATCH] HQL queries without a primary alias don't need Sorted properties prefixed. If a Hibernate query doesn't have a primary alias, don't attempt to prefix any Sort properties using it. See #2969 Original Pull Request #2971 --- .../repository/query/JpaQueryTransformerSupport.java | 11 +++++++++-- .../repository/query/HqlQueryTransformerTests.java | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java index acc73c772..20b6fe920 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java @@ -12,6 +12,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.JpaSort; import org.springframework.lang.Nullable; +import org.springframework.util.ObjectUtils; /** * Transformational operations needed to support either {@link HqlQueryTransformer} or {@link JpqlQueryTransformer}. @@ -103,7 +104,7 @@ class JpaQueryTransformerSupport { */ private String generateOrderByArgument(@Nullable String primaryFromAlias, Sort.Order order) { - if (shouldPrefixWithAlias(order)) { + if (shouldPrefixWithAlias(order, primaryFromAlias)) { return primaryFromAlias + "." + order.getProperty(); } else { return order.getProperty(); @@ -115,9 +116,15 @@ class JpaQueryTransformerSupport { * FROM clause's alias. * * @param order + * @param primaryFromAlias * @return boolean whether or not to apply the primary FROM clause's alias as a prefix */ - private boolean shouldPrefixWithAlias(Sort.Order order) { + private boolean shouldPrefixWithAlias(Sort.Order order, String primaryFromAlias) { + + // If there is no primary alias + if (ObjectUtils.isEmpty(primaryFromAlias)) { + return false; + } // If the Sort contains a function if (order.getProperty().contains("(")) { diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java index 0b691a4c3..172be0489 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java @@ -966,6 +966,13 @@ class HqlQueryTransformerTests { "order by newDateDue desc"); } + @Test // GH-2969 + void fromWithoutAPrimaryAliasShouldWork() { + + assertThat(createQueryFor("FROM Story WHERE enabled = true", Sort.by(Sort.Direction.DESC, "created"))) + .isEqualTo("FROM Story WHERE enabled = true order by created desc"); + } + private void assertCountQuery(String originalQuery, String countQuery) { assertThat(createCountQueryFor(originalQuery)).isEqualTo(countQuery); }