Support implicit joins in plural path parts and fix issues with type resolving of sub query paths

Author: beikov

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -3871,8 +3871,19 @@ private <X> SqmSubQuery<X> createCollectionReferenceSubQuery(
 		);
 		final SqmSelectClause selectClause = new SqmSelectClause( false, 1, creationContext.getNodeBuilder() );
 		final SqmFromClause fromClause = new SqmFromClause( 1 );
-		final SqmCorrelation<?, ?> correlation = ( (AbstractSqmFrom<?, ?>) pluralAttributePath.getLhs() ).createCorrelation();
-		final SqmAttributeJoin<?, ?> collectionJoin = correlation.join( pluralAttributePath.getNavigablePath().getUnaliasedLocalName() );
+		SqmPath<?> lhs = pluralAttributePath.getLhs();
+		final List<String> implicitJoinPaths = new ArrayList<>();
+		while ( !( lhs instanceof AbstractSqmFrom<?, ?> ) ) {
+			implicitJoinPaths.add( lhs.getNavigablePath().getUnaliasedLocalName() );
+			lhs = lhs.getLhs();
+		}
+		final AbstractSqmFrom<?, ?> correlationBase = (AbstractSqmFrom<?, ?>) lhs;
+		final SqmCorrelation<?, ?> correlation = correlationBase.createCorrelation();
+		SqmFrom<?, ?> joinBase = correlation;
+		for ( int i = implicitJoinPaths.size() - 1; i >= 0; i-- ) {
+			joinBase = joinBase.join( implicitJoinPaths.get( i ) );
+		}
+		final SqmAttributeJoin<?, ?> collectionJoin = joinBase.join( pluralAttributePath.getNavigablePath().getUnaliasedLocalName() );
 		fromClause.addRoot( correlation.getCorrelatedRoot() );
 		if ( collectionReferenceCtx == null ) {
 			final SqmLiteral<Integer> literal = new SqmLiteral<>(

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

@@ -185,7 +185,14 @@ private static ModelPart resolveSqmPath(
 			return domainModel.findEntityDescriptor( entityDomainType.getHibernateEntityName() );
 		}
 		final TableGroup lhsTableGroup = tableGroupLocator.apply( sqmPath.getLhs().getNavigablePath() );
-		return lhsTableGroup.getModelPart().findSubPart( sqmPath.getReferencedPathSource().getPathName(), null );
+		final ModelPartContainer modelPart;
+		if ( lhsTableGroup == null ) {
+			modelPart = (ModelPartContainer) resolveSqmPath( sqmPath.getLhs(), domainModel, tableGroupLocator );
+		}
+		else {
+			modelPart = lhsTableGroup.getModelPart();
+		}
+		return modelPart.findSubPart( sqmPath.getReferencedPathSource().getPathName(), null );
 	}
 
 	public static EntityMappingType resolveExplicitTreatTarget(

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

@@ -4555,7 +4555,6 @@ private MappingModelExpressible<?> determineValueMapping(SqmExpression<?> sqmExp
 		}
 		else if ( sqmExpression instanceof SqmPath ) {
 			log.debugf( "Determining mapping-model type for SqmPath : %s ", sqmExpression );
-			prepareReusablePath( (SqmPath<?>) sqmExpression, fromClauseIndex, () -> null );
 			final MappingMetamodel domainModel = creationContext.getSessionFactory()
 					.getRuntimeMetamodels()
 					.getMappingMetamodel();
@@ -4577,40 +4576,16 @@ else if ( sqmExpression instanceof SqmSubQuery<?> ) {
 			final SqmSelectClause selectClause = subQuery.getQuerySpec().getSelectClause();
 			if ( selectClause.getSelections().size() == 1 ) {
 				final SqmSelection<?> subQuerySelection = selectClause.getSelections().get( 0 );
+				final SqmSelectableNode<?> selectableNode = subQuerySelection.getSelectableNode();
+				if ( selectableNode instanceof SqmExpression<?> ) {
+					return determineValueMapping( (SqmExpression<?>) selectableNode, fromClauseIndex );
+				}
 				final SqmExpressible<?> selectionNodeType = subQuerySelection.getNodeType();
 				if ( selectionNodeType != null ) {
-					final SqmExpressible<?> sqmExpressible;
-					if ( selectionNodeType instanceof PluralPersistentAttribute ) {
-						sqmExpressible = ( (PluralPersistentAttribute<?,?,?>) selectionNodeType ).getElementPathSource();
-					}
-					else if ( selectionNodeType instanceof SqmPathSource<?>) {
-						final SqmPathSource<?> pathSource = (SqmPathSource<?>) selectionNodeType;
-						final CollectionPart.Nature partNature = CollectionPart.Nature.fromName(
-								pathSource.getPathName()
-						);
-						if ( partNature == null ) {
-							sqmExpressible = selectionNodeType;
-						}
-						else {
-							final SqmPath<?> sqmPath = (SqmPath<?>) subQuerySelection.getSelectableNode();
-							final NavigablePath navigablePath = sqmPath.getNavigablePath().getParent();
-							if ( navigablePath.getParent() != null ) {
-								final TableGroup parentTableGroup = fromClauseIndex.findTableGroup( navigablePath.getParent() );
-								final PluralAttributeMapping pluralPart = (PluralAttributeMapping) parentTableGroup.getModelPart()
-										.findSubPart( navigablePath.getUnaliasedLocalName(), null );
-								return pluralPart.findSubPart( pathSource.getPathName(), null );
-							}
-							return fromClauseIndex.findTableGroup( navigablePath ).getModelPart();
-						}
-					}
-					else {
-						sqmExpressible = selectionNodeType;
-					}
-
 					final MappingMetamodel domainModel = creationContext.getSessionFactory()
 							.getRuntimeMetamodels()
 							.getMappingMetamodel();
-					final MappingModelExpressible<?> expressible = domainModel.resolveMappingExpressible(sqmExpressible, this::findTableGroupByPath );
+					final MappingModelExpressible<?> expressible = domainModel.resolveMappingExpressible(selectionNodeType, this::findTableGroupByPath );
 
 					if ( expressible != null ) {
 						return expressible;

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java

@@ -9,7 +9,6 @@
 import java.util.List;
 
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -61,7 +60,6 @@ public void testMapCompositeElementWithFormula(SessionFactoryScope scope) {
 
 	@SuppressWarnings( {"unchecked"})
 	@Test
-	@NotImplementedYet( strict = false )
 	public void testQueryMapCompositeElement(SessionFactoryScope scope) {
 		scope.inTransaction( (s) -> {
 			Part top = new Part("top", "The top part");