HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Author: gbadner

hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/spaces/CompositeQuerySpaceImpl.java

@@ -30,6 +30,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.PropertyMapping;
+import org.hibernate.persister.entity.Queryable;
 import org.hibernate.persister.walking.spi.AttributeDefinition;
 import org.hibernate.persister.walking.spi.CompositionDefinition;
 import org.hibernate.type.AssociationType;
@@ -105,7 +106,9 @@ public JoinImpl addEntityJoin(
 			EntityPersister persister,
 			String querySpaceUid,
 			boolean optional) {
-		final boolean required = canJoinsBeRequired() && !optional;
+		// TODO: Queryable.isMultiTable() may be more broad than it needs to be...
+		final boolean isMultiTable = Queryable.class.cast( persister ).isMultiTable();
+		final boolean required = canJoinsBeRequired() && !isMultiTable && !optional;
 
 		final EntityQuerySpaceImpl rhs = new EntityQuerySpaceImpl(
 				persister,

hibernate-core/src/main/java/org/hibernate/loader/plan2/build/internal/spaces/EntityQuerySpaceImpl.java

@@ -31,6 +31,8 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.PropertyMapping;
+import org.hibernate.persister.entity.Queryable;
+import org.hibernate.persister.walking.spi.AssociationAttributeDefinition;
 import org.hibernate.persister.walking.spi.AttributeDefinition;
 import org.hibernate.persister.walking.spi.CompositionDefinition;
 import org.hibernate.type.AssociationType;
@@ -106,7 +108,9 @@ public JoinImpl addEntityJoin(
 			EntityPersister persister,
 			String querySpaceUid,
 			boolean optional) {
-		final boolean required = canJoinsBeRequired() && !optional;
+		// TODO: Queryable.isMultiTable() may be more broad than it needs to be...
+		final boolean isMultiTable = Queryable.class.cast( persister ).isMultiTable();
+		final boolean required = canJoinsBeRequired() && !isMultiTable && !optional;
 
 		final EntityQuerySpaceImpl rhs = new EntityQuerySpaceImpl(
 				persister,