Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Reduce code duplication.

Original Pull Request: #3248
This commit is contained in:
Christoph Strobl
2024-01-29 11:39:16 +01:00
parent c5aa790e39
commit 00c82766cb
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JSqlParserQueryEnhancer.java
View File

@@ -57,6 +57,7 @@ import org.springframework.util.StringUtils;
* @author Greg Turnquist
* @author Geoffrey Deremetz
* @author Yanming Zhou
* @author Christoph Strobl
* @since 2.7.0
*/
public class JSqlParserQueryEnhancer implements QueryEnhancer {
@@ -140,7 +141,6 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
selectBody.getOrderByElements().addAll(orderByElements);
return selectStatement.toString();
}
/**
@@ -380,7 +380,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
if (StringUtils.hasText(countProjection)) {
Function jSqlCount = getJSqlCount(Collections.singletonList(countProjection), false);
selectBody.setSelectItems(Collections.singletonList(new SelectItem(jSqlCount)));
selectBody.setSelectItems(Collections.singletonList(SelectItem.from(jSqlCount)));
return selectBody.toString();
}
@@ -388,26 +388,10 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
selectBody.setDistinct(null); // reset possible distinct
String tableAlias = detectAlias(selectBody);
String countProperty = countPropertyNameForSelection(selectBody.getSelectItems(), distinct, tableAlias);
// is never null
List<SelectItem<?>> selectItems = selectBody.getSelectItems();
if (onlyASingleColumnProjection(selectItems)) {
SelectItem<?> singleProjection = (SelectItem<?>) selectItems.get(0);
Column column = (Column) singleProjection.getExpression();
String countProp = column.getFullyQualifiedName();
Function jSqlCount = getJSqlCount(Collections.singletonList(countProp), distinct);
selectBody.setSelectItems(Collections.singletonList(new SelectItem<>(jSqlCount)));
return selectBody.toString();
}
String countProp = query.isNativeQuery() ? (distinct ? "*" : "1") : tableAlias == null ? "*" : tableAlias;
Function jSqlCount = getJSqlCount(Collections.singletonList(countProp), distinct);
selectBody.setSelectItems(Collections.singletonList(new SelectItem(jSqlCount)));
Function jSqlCount = getJSqlCount(Collections.singletonList(countProperty), distinct);
selectBody.setSelectItems(Collections.singletonList(SelectItem.from(jSqlCount)));
return selectBody.toString();
}
@@ -485,7 +469,29 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
// this is unfortunately the only way to check without any hacky & hard string regex magic
return projection.size() == 1 && projection.get(0) instanceof SelectItem<?>
&& (((SelectItem<?>) projection.get(0)).getExpression()) instanceof Column;
&& ((projection.get(0)).getExpression()) instanceof Column;
}
/**
* Get the count property if present in {@link SelectItem slected items}, {@literal *} or {@literal 1} for native ones
* and {@literal *} or the given {@literal tableAlias}.
*
* @param selectItems items from the select.
* @param distinct indicator if query for distinct values.
* @param tableAlias the table alias which can be {@literal null}.
* @return
*/
private String countPropertyNameForSelection(List<SelectItem<?>> selectItems, boolean distinct,
@Nullable String tableAlias) {
if (onlyASingleColumnProjection(selectItems)) {
SelectItem<?> singleProjection = selectItems.get(0);
Column column = (Column) singleProjection.getExpression();
return column.getFullyQualifiedName();
}
return query.isNativeQuery() ? (distinct ? "*" : "1") : tableAlias == null ? "*" : tableAlias;
}
@Override