Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-28 06:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-8276 - Integrate LoadPlans into UniqueEntityLoader (PoC)

Browse Source
This commit is contained in:
Gail Badner 2013-09-17 17:04:27 -07:00 committed by Steve Ebersole
parent 1e79efd10a
commit ee02fafbba
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.PropertyMapping; 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.AttributeDefinition;
import org.hibernate.persister.walking.spi.CompositionDefinition; import org.hibernate.persister.walking.spi.CompositionDefinition;
import org.hibernate.type.AssociationType; import org.hibernate.type.AssociationType;
@ -105,7 +106,9 @@ public JoinImpl addEntityJoin(
EntityPersister persister, EntityPersister persister,
String querySpaceUid, String querySpaceUid,
boolean optional) { 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( final EntityQuerySpaceImpl rhs = new EntityQuerySpaceImpl(
persister, persister,

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

@ -31,6 +31,8 @@
import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.PropertyMapping; 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.AttributeDefinition;
import org.hibernate.persister.walking.spi.CompositionDefinition; import org.hibernate.persister.walking.spi.CompositionDefinition;
import org.hibernate.type.AssociationType; import org.hibernate.type.AssociationType;
@ -106,7 +108,9 @@ public JoinImpl addEntityJoin(
EntityPersister persister, EntityPersister persister,
String querySpaceUid, String querySpaceUid,
boolean optional) { 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( final EntityQuerySpaceImpl rhs = new EntityQuerySpaceImpl(
persister, persister,