HHH-19396 Parameter deduplicateSelectionItems must be set only for temporary tables and subqueries

          Selection items representing same column in (sub)query will be represented with single instance, this will hide real alias

Author: cigaly

hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java

@@ -12,6 +12,7 @@
 import java.util.Map;
 
 import jakarta.persistence.metamodel.Bindable;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.UnsupportedMappingException;
@@ -27,9 +28,8 @@
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
-import org.hibernate.query.sqm.tree.select.SqmSelectClause;
-import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
-import org.hibernate.query.sqm.tree.select.SqmSubQuery;
+import org.hibernate.query.sqm.tree.select.*;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.type.BasicType;
@@ -38,52 +38,75 @@
 
 import jakarta.persistence.metamodel.Attribute;
 
+import static org.hibernate.internal.util.collections.CollectionHelper.linkedMapOfSize;
+
 
 /**
  * @author Christian Beikov
  */
 @Incubating
 public class AnonymousTupleType<T> implements TupleType<T>, DomainType<T>, ReturnableType<T>, SqmPathSource<T> {
 
-	private final ObjectArrayJavaType javaTypeDescriptor;
+	private final JavaType<T> javaTypeDescriptor;
+	private final @Nullable NavigablePath[] componentSourcePaths;
 	private final SqmSelectableNode<?>[] components;
+	private final String[] componentNames;
 	private final Map<String, Integer> componentIndexMap;
 
-	public AnonymousTupleType(SqmSubQuery<T> subQuery) {
-		this( extractSqmExpressibles( subQuery ) );
-	}
+	public AnonymousTupleType(SqmSelectQuery<T> selectQuery) {
+		final SqmSelectClause selectClause = selectQuery.getQueryPart()
+				.getFirstQuerySpec()
+				.getSelectClause();
+
+		if ( selectClause == null || selectClause.getSelections().isEmpty() ) {
+			throw new IllegalArgumentException( "selectQuery has no selection items" );
+		}
+		// todo: right now, we "snapshot" the state of the selectQuery when creating this type, but maybe we shouldn't?
+		//  i.e. what if the selectQuery changes later on? Or should we somehow mark the selectQuery to signal,
+		//  that changes to the select clause are invalid after a certain point?
 
-	public AnonymousTupleType(SqmSelectableNode<?>[] components) {
-		this.components = components;
-		this.javaTypeDescriptor = new ObjectArrayJavaType( getTypeDescriptors( components ) );
-		final Map<String, Integer> map = CollectionHelper.linkedMapOfSize( components.length );
-		for ( int i = 0; i < components.length; i++ ) {
-			final SqmSelectableNode<?> component = components[i];
-			final String alias = component.getAlias();
+		final List<SqmSelection<?>> selections = selectClause.getSelections();
+		final List<SqmSelectableNode<?>> selectableNodes = new ArrayList<>();
+		final List<String> aliases = new ArrayList<>();
+		for ( SqmSelection<?> selection : selections ) {
+			final boolean compound = selection.getSelectableNode().isCompoundSelection();
+			selection.getSelectableNode().visitSubSelectableNodes( node -> {
+				selectableNodes.add( node );
+				if ( compound ) {
+					aliases.add( node.getAlias() );
+				}
+			} );
+			if ( !compound ) {
+				// for compound selections we use the sub-selectable nodes aliases
+				aliases.add( selection.getAlias() );
+			}
+		}
+
+		components = new SqmSelectableNode<?>[selectableNodes.size()];
+		componentSourcePaths = new NavigablePath[selectableNodes.size()];
+		componentNames = new String[selectableNodes.size()];
+		//noinspection unchecked
+		javaTypeDescriptor = (JavaType<T>) new ObjectArrayJavaType( getTypeDescriptors( selectableNodes ) );
+		componentIndexMap = linkedMapOfSize( selectableNodes.size() );
+		for ( int i = 0; i < selectableNodes.size(); i++ ) {
+			components[i] = selectableNodes.get(i);
+			if ( components[i] instanceof SqmPath<?> ) {
+				componentSourcePaths[i] = ((SqmPath<?>) components[i]).getNavigablePath();
+			}
+			String alias = aliases.get( i );
 			if ( alias == null ) {
 				throw new SemanticException( "Select item at position " + (i+1) + " in select list has no alias"
 						+ " (aliases are required in CTEs and in subqueries occurring in from clause)" );
 			}
-			map.put( alias, i );
+			componentIndexMap.put( alias, i );
+			componentNames[i] = alias;
 		}
-		this.componentIndexMap = map;
-	}
-
-	private static SqmSelectableNode<?>[] extractSqmExpressibles(SqmSubQuery<?> subQuery) {
-		final SqmSelectClause selectClause = subQuery.getQuerySpec().getSelectClause();
-		if ( selectClause == null || selectClause.getSelectionItems().isEmpty() ) {
-			throw new IllegalArgumentException( "subquery has no selection items" );
-		}
-		// todo: right now, we "snapshot" the state of the subquery when creating this type, but maybe we shouldn't?
-		//  i.e. what if the subquery changes later on? Or should we somehow mark the subquery to signal,
-		//  that changes to the select clause are invalid after a certain point?
-		return selectClause.getSelectionItems().toArray( SqmSelectableNode[]::new );
 	}
 
-	private static JavaType<?>[] getTypeDescriptors(SqmSelectableNode<?>[] components) {
-		final JavaType<?>[] typeDescriptors = new JavaType<?>[components.length];
-		for ( int i = 0; i < components.length; i++ ) {
-			typeDescriptors[i] = components[i].getExpressible().getExpressibleJavaType();
+	private static JavaType<?>[] getTypeDescriptors(List<SqmSelectableNode<?>> components) {
+		final JavaType<?>[] typeDescriptors = new JavaType<?>[components.size()];
+		for ( int i = 0; i < components.size(); i++ ) {
+			typeDescriptors[i] = components.get( i ).getExpressible().getExpressibleJavaType();
 		}
 		return typeDescriptors;
 	}
@@ -143,7 +166,7 @@ public int componentCount() {
 
 	@Override
 	public String getComponentName(int index) {
-		return components[index].getAlias();
+		return componentNames[index];
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -1926,11 +1926,14 @@ public CteContainer visitCteContainer(SqmCteContainer consumer) {
 		final Collection<SqmCteStatement<?>> sqmCteStatements = consumer.getCteStatements();
 		cteContainer = new CteContainerImpl( cteContainer );
 		if ( !sqmCteStatements.isEmpty() ) {
+			final boolean originalDeduplicateSelectionItems = deduplicateSelectionItems;
+			deduplicateSelectionItems = false;
 			currentClauseStack.push( Clause.WITH );
 			for ( SqmCteStatement<?> sqmCteStatement : sqmCteStatements ) {
 				visitCteStatement( sqmCteStatement );
 			}
 			currentClauseStack.pop();
+			deduplicateSelectionItems = originalDeduplicateSelectionItems;
 			// Avoid leaking the processing state from CTEs to upper levels
 			lastPoppedFromClauseIndex = null;
 			lastPoppedProcessingState = null;

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java

@@ -18,8 +18,6 @@
 import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.select.SqmSelectQuery;
-import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
-import org.hibernate.query.sqm.tree.select.SqmSelectableNode;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.type.BasicType;
@@ -36,8 +34,8 @@ public class SqmCteTable<T> extends AnonymousTupleType<T> implements JpaCteCrite
 	private SqmCteTable(
 			String name,
 			SqmCteStatement<T> cteStatement,
-			SqmSelectableNode<?>[] sqmSelectableNodes) {
-		super( sqmSelectableNodes );
+			SqmSelectQuery<T> selectStatement) {
+		super(selectStatement);
 		this.name = name;
 		this.cteStatement = cteStatement;
 		final List<SqmCteTableColumn> columns = new ArrayList<>( componentCount() );
@@ -57,12 +55,7 @@ public static <X> SqmCteTable<X> createStatementTable(
 			String name,
 			SqmCteStatement<X> cteStatement,
 			SqmSelectQuery<X> selectStatement) {
-		final SqmSelectableNode<?>[] sqmSelectableNodes = selectStatement.getQueryPart()
-				.getFirstQuerySpec()
-				.getSelectClause()
-				.getSelectionItems()
-				.toArray( SqmSelectableNode[]::new );
-		return new SqmCteTable<>( name, cteStatement, sqmSelectableNodes );
+		return new SqmCteTable<>( name, cteStatement, selectStatement );
 	}
 
 	@Override