The raw tuple queries we fix :)

Author: christophstrobl

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java

@@ -24,6 +24,7 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.Bindable;
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.Metamodel;
@@ -33,6 +34,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.JpaSort;
@@ -215,12 +217,19 @@ private JpqlQueryBuilder.Select doSelect(Sort sort) {
 
 		if (returnedType.needsCustomConstruction()) {
 
-			Collection<String> requiredSelection = getRequiredSelection(sort, returnedType);
+			Collection<String> requiredSelection = null;
+			if (returnedType.getReturnedType().getPackageName().startsWith("java.util")
+					|| returnedType.getReturnedType().getPackageName().startsWith("jakarta.persistence")) {
+				requiredSelection = metamodel.managedType(returnedType.getDomainType()).getAttributes().stream()
+						.map(Attribute::getName).collect(Collectors.toList());
+			} else {
+				requiredSelection = getRequiredSelection(sort, returnedType);
+			}
 
 			List<PathAndOrigin> paths = new ArrayList<>(requiredSelection.size());
 			for (String selection : requiredSelection) {
-				paths.add(
-						JpqlUtils.toExpressionRecursively(metamodel, entity, entityType, PropertyPath.from(selection, returnedType.getDomainType()), true));
+				paths.add(JpqlUtils.toExpressionRecursively(metamodel, entity, entityType,
+						PropertyPath.from(selection, returnedType.getDomainType()), true));
 			}
 
 			if (useTupleQuery()) {
@@ -236,8 +245,8 @@ private JpqlQueryBuilder.Select doSelect(Sort sort) {
 			if (entityType.hasSingleIdAttribute()) {
 
 				SingularAttribute<?, ?> id = entityType.getId(entityType.getIdType().getJavaType());
-				return selectStep.select(
-						JpqlUtils.toExpressionRecursively(metamodel, entity, entityType, PropertyPath.from(id.getName(), returnedType.getDomainType()), true));
+				return selectStep.select(JpqlUtils.toExpressionRecursively(metamodel, entity, entityType,
+						PropertyPath.from(id.getName(), returnedType.getDomainType()), true));
 
 			} else {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryCreatorTests.java

@@ -24,12 +24,14 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.Tuple;
 import jakarta.persistence.metamodel.Metamodel;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.Disabled;
@@ -59,8 +61,8 @@
  */
 class JpaQueryCreatorTests {
 
-	private static final TestMetaModel ORDER = TestMetaModel.hibernateModel(Order.class, LineItem.class, Product.class,
-			Person.class);
+	private static final TestMetaModel ORDER = TestMetaModel.hibernateModel(Order.class, LineItem.class, Product.class);
+	private static final TestMetaModel PERSON = TestMetaModel.hibernateModel(Person.class);
 
 	static List<JpqlQueryTemplates> ignoreCaseTemplates = List.of(JpqlQueryTemplates.LOWER, JpqlQueryTemplates.UPPER);
 
@@ -674,6 +676,22 @@ void interfaceProjection() {
 				.validateQuery();
 	}
 
+	@ParameterizedTest
+	@ValueSource(classes = { Tuple.class, Map.class })
+	void tupleProjection(Class<?> resultType) {
+
+		queryCreator(PERSON) //
+				.forTree(Person.class, "findProjectionByFirstnameIs") //
+				.returing(resultType) //
+				.withParameters("chris") //
+				.as(QueryCreatorTester::create) //
+				.expectJpql("SELECT p.id id, p.firstname firstname, p.lastname lastname FROM %s p WHERE p.firstname = ?1",
+						Person.class.getName()) //
+				.validateQuery();
+	}
+
+	// TODO: delete queries
+
 	QueryCreatorBuilder queryCreator(Metamodel metamodel) {
 		return new DefaultCreatorBuilder(metamodel);
 	}
@@ -764,7 +782,8 @@ static class LineItem {
 	@jakarta.persistence.Entity
 	static class Person {
 		@Id Long id;
-		String name;
+		String firstname;
+		String lastname;
 	}
 
 	@jakarta.persistence.Entity