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
This commit is contained in:
Greg L. Turnquist
2023-05-23 07:40:04 -05:00
parent 6d20cab356
commit 235a6d3397
2 changed files with 16 additions and 2 deletions

View File

@@ -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("(")) {

View File

@@ -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);
}