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

Retain selection columns on query transformation without entity alias.

Browse Source 
Closes #3744
This commit is contained in:
Mark Paluch
2025-01-14 10:35:26 +01:00
parent f2d1a358fb
commit 6d13559a3d
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java
View File

@@ -127,11 +127,6 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
if (ctx.variable() != null) {
builder.appendExpression(visit(ctx.variable()));
} else {
builder.append(TOKEN_AS);
builder.append(TOKEN_DOUBLE_UNDERSCORE);
}
} else if (ctx.subquery() != null) {
@@ -186,14 +181,26 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
boolean usesDistinct = ctx.DISTINCT() != null;
QueryRendererBuilder nested = QueryRenderer.builder();
if (countProjection == null) {
QueryTokenStream selection = visit(ctx.selectionList());
if (usesDistinct) {
nested.append(QueryTokens.expression(ctx.DISTINCT()));
nested.append(getDistinctCountSelection(visit(ctx.selectionList())));
nested.append(getDistinctCountSelection(selection));
} else {
// with CTE primary alias fails with hibernate (WITH entities AS (…) SELECT count(c) FROM entities c)
nested.append(containsCTE ? QueryTokens.token("*") : QueryTokens.token(primaryFromAlias));
if (containsCTE) {
nested.append(QueryTokens.token("*"));
} else {
if (selection.size() == 1) {
nested.append(selection);
} else if (primaryFromAlias != null) {
nested.append(QueryTokens.token(primaryFromAlias));
} else {
nested.append(QueryTokens.token("*"));
}
}
}
} else {
builder.append(QueryTokens.token(countProjection));
@@ -244,6 +251,7 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
}
private QueryRendererBuilder visitSubQuerySelectClause(SelectClauseContext ctx, QueryRendererBuilder builder) {
if (ctx.DISTINCT() != null) {
builder.append(QueryTokens.expression(ctx.DISTINCT()));
}
@@ -258,8 +266,13 @@ class HqlCountQueryTransformer extends HqlQueryRenderer {
CountSelectionTokenStream countSelection = CountSelectionTokenStream.create(selectionListbuilder);
if (countSelection.requiresPrimaryAlias()) {
// constructor
nested.append(QueryTokens.token(primaryFromAlias));
if (primaryFromAlias != null) {
// constructor
nested.append(QueryTokens.token(primaryFromAlias));
} else {
nested.append(countSelection.withoutConstructorExpression());
}
} else {
// keep all the select items to distinct against
nested.append(selectionListbuilder);

4
spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerTckTests.java
View File

@@ -68,6 +68,10 @@ abstract class QueryEnhancerTckTests {
"select u from User as u", //
"select count(u) from User as u"),
Arguments.of( //
"SELECT id FROM Person", //
"select count(id) from Person"),
Arguments.of( //
"SELECT u FROM User u where u.foo.bar = ?", //
"select count(u) FROM User u where u.foo.bar = ?"),