Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* </ul>
*
* @author Mark Paluch
* @author HeeHoon Hong
* @since 3.5
*/
class DtoProjectionTransformerDelegate {
Expand All @@ -55,7 +56,20 @@ public boolean applyRewriting() {
}

public boolean canRewrite() {
return !selectItems.isEmpty() && applyRewriting();

if (selectItems.isEmpty() || !applyRewriting()) {
return false;
}

// Avoid rewriting if the selection list is already expanded and the target type is a record
// to leverage JPA 4.0 implicit DTO mapping.
boolean expansion = selectItems.size() == 1 && selectItems.get(0).size() == 1;

if (!expansion && returnedType.getReturnedType().isRecord()) {
return false;
}

return true;
}

public void appendSelectItem(QueryTokenStream selectItem) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* Support class for unit tests for {@link DtoProjectionTransformerDelegate}.
*
* @author Mark Paluch
* @author HeeHoon Hong
*/
abstract class AbstractDtoQueryTransformerUnitTests<P extends JpaQueryEnhancer<? extends QueryInformation>> {

Expand All @@ -56,7 +57,7 @@ void shouldRewriteSelectionToConstructorExpression() {
QueryTokenStream visit = getTransformer(parser).visit(parser.getContext());

assertThat(QueryRenderer.TokenRenderer.render(visit)).isEqualTo(
"SELECT new org.springframework.data.jpa.repository.query.AbstractDtoQueryTransformerUnitTests$MyRecord(p.name) from Person p");
"SELECT p.name from Person p");
}

@Test // GH-3076
Expand Down Expand Up @@ -99,7 +100,7 @@ void shouldTranslatePropertySelectionToDto() {
QueryTokenStream visit = getTransformer(parser).visit(parser.getContext());

assertThat(QueryRenderer.TokenRenderer.render(visit)).isEqualTo(
"SELECT new org.springframework.data.jpa.repository.query.AbstractDtoQueryTransformerUnitTests$MyRecord(p.foo, p.bar, sum(p.age)) from Person p");
"SELECT p.foo, p.bar, sum(p.age) from Person p");
}

@Test // GH-3895
Expand All @@ -110,7 +111,7 @@ void shouldStripAliasesFromDtoProjection() {
QueryTokenStream visit = getTransformer(parser).visit(parser.getContext());

assertThat(QueryRenderer.TokenRenderer.render(visit)).isEqualTo(
"SELECT new org.springframework.data.jpa.repository.query.AbstractDtoQueryTransformerUnitTests$MyRecord(sum(p.age), p.foo, p.bar) from Person p");
"SELECT sum(p.age) As age, p.foo as foo, p.bar AS bar from Person p");
}

@Test // GH-3895
Expand All @@ -122,7 +123,7 @@ void shouldStripAliasesFromDtoProjectionWithSubquery() {
QueryTokenStream visit = getTransformer(parser).visit(parser.getContext());

assertThat(QueryRenderer.TokenRenderer.render(visit)).isEqualTo(
"SELECT new org.springframework.data.jpa.repository.query.AbstractDtoQueryTransformerUnitTests$MyRecord(p.foo, p.bar, cast(p.age as INTEGER), (SELECT b.foo FROM Bar AS b)) from Person p");
"SELECT p.foo as foo, p.bar AS bar, cast(p.age as INTEGER) As age, (SELECT b.foo FROM Bar AS b) from Person p");
}

private JpaQueryMethod getMethod(String name, Class<?>... parameterTypes) {
Expand Down