HHH-19396 Refactoring SqmCteTable and AnonymousTupleType constructors

          Temporary deduplication disabling moved from org.hibernate.query.sqm.internal.ConcreteSqmSelectQueryPlan.buildCacheableSqmInterpretation into org.hibernate.query.sqm.sql.BaseSqmToSqlAstConverter.visitCteContainer

Author: cigaly

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java

@@ -491,7 +491,7 @@ private static CacheableSqmInterpretation buildCacheableSqmInterpretation(
 								executionContext.getQueryParameterBindings(),
 								executionContext.getSession().getLoadQueryInfluencers(),
 								sessionFactory.getSqlTranslationEngine(),
-								sqm.getCteStatements().isEmpty()
+								true
 						)
 						.translate();
 

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

@@ -1813,11 +1813,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

@@ -17,7 +17,6 @@
 import org.hibernate.query.sqm.tuple.internal.CteTupleTableGroupProducer;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.select.SqmSelectQuery;
-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;
@@ -34,14 +33,13 @@ public class SqmCteTable<T> extends AnonymousTupleType<T> implements JpaCteCrite
 	private SqmCteTable(
 			String name,
 			SqmCteStatement<T> cteStatement,
-			SqmSelectableNode<?>[] sqmSelectableNodes,
-			List<String> aliases) {
-		super( sqmSelectableNodes, aliases );
+			SqmSelectQuery<T> selectStatement) {
+		super(selectStatement);
 		this.name = name;
 		this.cteStatement = cteStatement;
 		final List<SqmCteTableColumn> columns = new ArrayList<>( componentCount() );
 		for ( int i = 0; i < componentCount(); i++ ) {
-			columns.add( new SqmCteTableColumn( this, aliases.get(i), get(i) ) );
+			columns.add( new SqmCteTableColumn( this, getComponentName(i), get(i) ) );
 		}
 		this.columns = columns;
 	}
@@ -50,12 +48,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, extractAliases(selectStatement) );
+		return new SqmCteTable<>( name, cteStatement, selectStatement );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java

@@ -23,13 +23,13 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPluralPersistentAttribute;
 import org.hibernate.query.sqm.tree.select.SqmSelectQuery;
+import org.hibernate.query.sqm.tree.select.SqmSelection;
 import org.hibernate.query.sqm.tuple.TupleType;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.sqm.SqmExpressible;
 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.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -56,29 +56,50 @@ public class AnonymousTupleType<T>
 	private final String[] componentNames;
 	private final Map<String, Integer> componentIndexMap;
 
-	public AnonymousTupleType(SqmSubQuery<T> subQuery) {
-		this( extractSqmExpressibles( subQuery ), extractAliases( subQuery ) );
-	}
+	public AnonymousTupleType(SqmSelectQuery<T> selectQuery) {
+		final SqmSelectClause selectClause = selectQuery.getQueryPart()
+				.getFirstQuerySpec()
+				.getSelectClause();
 
-	public AnonymousTupleType(SqmSelectableNode<?>[] components, List<String> aliases) {
-		expressibles = new SqmBindableType<?>[components.length];
-		componentSourcePaths = new NavigablePath[components.length];
-		for ( int i = 0; i < components.length; i++ ) {
-			expressibles[i] = components[i].getNodeType();
-			if ( components[i] instanceof SqmPath<?> path ) {
-				componentSourcePaths[i] = path.getNavigablePath();
+		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?
+
+		final List<SqmSelection<?>> selections = selectClause.getSelections();
+		final List<SqmSelectableNode<?>> selectableNodes = new ArrayList<>();
+		final List<String> aliases = new ArrayList<>();
+		if ( selections != null ) {
+			for ( SqmSelection<?> selection : selections ) {
+				selection.getSelectableNode().visitSubSelectableNodes( selectableNodes::add );
+
+				if ( selection.getSelectableNode().isCompoundSelection() ) {
+					selection.getSelectableNode().visitSubSelectableNodes( node ->
+							aliases.add( node.getAlias() )
+					);
+				}
+				else {
+					aliases.add( selection.getAlias() );
+				}
 			}
 		}
+
+		final SqmSelectableNode<?>[] components = selectableNodes.toArray(new SqmSelectableNode[0]);
+
+		expressibles = new SqmBindableType<?>[components.length];
+		componentSourcePaths = new NavigablePath[components.length];
 		componentNames = new String[components.length];
 		//noinspection unchecked
 		javaTypeDescriptor = (JavaType<T>) new ObjectArrayJavaType( getTypeDescriptors( components ) );
 		componentIndexMap = linkedMapOfSize( components.length );
 		for ( int i = 0; i < components.length; i++ ) {
-			final SqmSelectableNode<?> component = components[i];
-			String alias = aliases == null ? null : aliases.get( i );
-			if ( alias == null ) {
-				alias = component.getAlias();
+			expressibles[i] = components[i].getNodeType();
+			if ( components[i] instanceof SqmPath<?> path ) {
+				componentSourcePaths[i] = path.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)" );
@@ -114,31 +135,6 @@ public String getTypeName() {
 		return SqmDomainType.super.getTypeName();
 	}
 
-	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 );
-	}
-
-	protected static List<String> extractAliases(SqmSelectQuery<?> subQuery) {
-		final SqmSelectClause selectClause = subQuery.getQueryPart()
-				.getFirstQuerySpec()
-				.getSelectClause();
-		final var aliases = new ArrayList<String>();
-		for (final var selection : selectClause.getSelections()) {
-			final var alias = selection.getAlias();
-			selection.getSelectableNode().visitSubSelectableNodes( node ->
-					aliases.add( alias == null ? node.getAlias() : alias )
-			);
-		}
-		return aliases;
-	}
-
 	private static JavaType<?>[] getTypeDescriptors(SqmSelectableNode<?>[] components) {
 		final JavaType<?>[] typeDescriptors = new JavaType<?>[components.length];
 		for ( int i = 0; i < components.length; i++ ) {