HHH-13140 Criteria API multiselect aliases are not passed through to …

…the JPQL query and they are not available in ResultTransformer
hibernate · Sep 25, 2021 · ca83c6c · ca83c6c
1 parent 6cb13dd
commit ca83c6c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 42 deletions.
diff --git a/...rnate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/...rnate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
@@ -21,6 +21,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.EmptyScrollableResults;
+import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.metamodel.mapping.MappingModelExpressable;
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.criteria.JpaSelection;
@@ -188,19 +189,15 @@ private RowTransformer<R> makeRowTransformerTupleTransformerAdapter(
 			SqmSelectStatement sqm,
 			QueryOptions queryOptions) {
 		final List<String> aliases = new ArrayList<>();
-		sqm.getQuerySpec().getSelectClause().getSelections()
-				.stream()
-				.forEach(
-						sqmSelection -> {
-							final String[] selectionAliases = sqmSelection.getAliases();
-							for ( int i = 0; i < selectionAliases.length; i++ ) {
-								final String alias = selectionAliases[i];
-								aliases.add( alias );
-							}
-						}
-				);
+		sqm.getQuerySpec().getSelectClause().getSelections().forEach(
+				sqmSelection ->
+					sqmSelection.getSelectableNode().visitSubSelectableNodes(
+							subSelection -> aliases.add( subSelection.getAlias() )
+					)
+		);
+
 		return new RowTransformerTupleTransformerAdapter<>(
-				aliases.toArray( new String[] {} ), queryOptions.getTupleTransformer()
+				ArrayHelper.toStringArray( aliases ), queryOptions.getTupleTransformer()
 		);
 	}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
@@ -33,6 +33,7 @@
 import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
 import org.hibernate.query.NavigablePath;
 import org.hibernate.query.criteria.JpaPath;
+import org.hibernate.query.criteria.JpaSelection;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -608,4 +609,12 @@ public void appendHqlString(StringBuilder sb) {
 			sb.append( alias );
 		}
 	}
+
+	@Override
+	public JpaSelection<T> alias(String name) {
+		if ( getExplicitAlias() == null ) {
+			setExplicitAlias( name );
+		}
+		return super.alias( name );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
@@ -105,9 +105,4 @@ public SqmAttributeJoin<O, E> makeCopy(SqmCreationProcessingState creationProces
 				nodeBuilder()
 		);
 	}
-
-	@Override
-	public String getAlias() {
-		return getExplicitAlias();
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
@@ -84,9 +84,4 @@ public SqmAttributeJoin<O, T> makeCopy(SqmCreationProcessingState creationProces
 				nodeBuilder()
 		);
 	}
-
-	@Override
-	public String getAlias() {
-		return getExplicitAlias();
-	}
 }
diff --git a/...rnate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java b/...rnate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
@@ -7,6 +7,7 @@
 package org.hibernate.query.sqm.tree.select;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import javax.persistence.criteria.Selection;
 
@@ -99,14 +100,6 @@ public String getAlias() {
 		return null;
 	}
 
-	public String[] getAliases() {
-		String[] aliases = new String[selectableNodes.size()];
-		for ( int i = 0; i < selectableNodes.size(); i++ ) {
-			aliases[i] = selectableNodes.get( i ).getAlias();
-		}
-		return aliases;
-	}
-
 	@Override
 	public boolean isCompoundSelection() {
 		return true;
@@ -124,7 +117,10 @@ public void appendHqlString(StringBuilder sb) {
 			sb.append(", ");
 			selectableNodes.get( i ).appendHqlString( sb );
 		}
-
 	}
 
+	@Override
+	public void visitSubSelectableNodes(Consumer<SqmSelectableNode<?>> jpaSelectionConsumer) {
+		selectableNodes.forEach( jpaSelectionConsumer );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
@@ -29,8 +29,4 @@ public interface SqmSelectableNode<T> extends JpaSelection<T>, SqmTypedNode<T>,
 	 * @see Selection#getCompoundSelectionItems()
 	 */
 	void visitSubSelectableNodes(Consumer<SqmSelectableNode<?>> jpaSelectionConsumer);
-
-	default String[] getAliases() {
-		return new String[] { getAlias() };
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelection.java
@@ -50,10 +50,6 @@ public String getAlias() {
 		return selectableNode.getAlias();
 	}
 
-	public String[] getAliases() {
-		return selectableNode.getAliases();
-	}
-
 	@Override
 	public <X> X accept(SemanticQueryWalker<X> walker) {
 		return walker.visitSelection( this );

diff --git a/...src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/...src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java
@@ -19,7 +19,6 @@
 
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.query.Query;
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.transform.Transformers;
 import org.junit.Before;
@@ -49,7 +48,6 @@ public void init() {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-13140")
 	@TestForIssue(jiraKey = "HHH-13140")
 	public void testAlias() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
@@ -76,7 +74,6 @@ public void testAlias() {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-13140")
 	@TestForIssue(jiraKey = "HHH-13192")
 	public void testNoAliasInWhereClause() {
 		doInJPA( this::entityManagerFactory, entityManager -> {