From a3cfd194f154b38aa2495149e5b554aa3585fa12 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 5 Jan 2022 09:41:56 +0100 Subject: [PATCH] Polishing. Minor formatting. See #2280 Original pull request #2399 --- .../springframework/data/jpa/repository/query/QueryUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index 213e21f03..e24a871ce 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -292,6 +292,7 @@ public abstract class QueryUtils { checkSortExpression(order); if (selectionAlias.contains(property)) { + return String.format("%s %s", // order.isIgnoreCase() ? String.format("lower(%s)", property) : property, // toJpaDirection(order)); @@ -300,7 +301,9 @@ public abstract class QueryUtils { boolean qualifyReference = !property.contains("("); // ( indicates a function for (String joinAlias : joinAliases) { + if (property.startsWith(joinAlias.concat("."))) { + qualifyReference = false; break; } @@ -342,6 +345,7 @@ public abstract class QueryUtils { * @return a {@literal Set} containing all found aliases. Guaranteed to be not {@literal null}. */ private static Set getFieldAliases(String query) { + Set result = new HashSet<>(); Matcher matcher = FIELD_ALIAS_PATTERN.matcher(query);