Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support FK column access optimization also for associations in embeddables of an element collection

This commit is contained in:
Christian Beikov 2022-01-31 10:34:03 +01:00
parent afdedb0fc5
commit 1e823386f6
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
View File

@ -359,20 +359,7 @@ public class ToOneAttributeMapping
isConstrained = bootValue.isConstrained();
this.navigableRole = navigableRole;
final CollectionPart.Nature nature = CollectionPart.Nature.fromNameExact(
getNavigableRole().getParent().getLocalName()
);
if ( nature == null ) {
// This is a simple to-one association
this.declaringTableGroupProducer = declaringEntityPersister;
}
else {
// This is a collection part i.e. to-many association
final String collectionRoleName = getNavigableRole().getParent().getParent().getLocalName();
this.declaringTableGroupProducer = ( (PluralAttributeMapping) declaringEntityPersister.findAttributeMapping(
collectionRoleName.substring( collectionRoleName.lastIndexOf( '.' ) + 1 )
) );
}
this.declaringTableGroupProducer = resolveDeclaringTableGroupProducer( declaringEntityPersister );
if ( referencedPropertyName == null ) {
final Set<String> targetKeyPropertyNames = new HashSet<>( 2 );
targetKeyPropertyNames.add( EntityIdentifierMapping.ROLE_LOCAL_NAME );
@ -471,6 +458,31 @@ public class ToOneAttributeMapping
}
}
private TableGroupProducer resolveDeclaringTableGroupProducer(EntityPersister declaringEntityPersister) {
// Also handle cases where a collection contains an embeddable, that contains an association
NavigableRole parentRole = getNavigableRole().getParent();
String collectionRole = null;
do {
final CollectionPart.Nature nature = CollectionPart.Nature.fromNameExact(
parentRole.getLocalName()
);
if (nature != null) {
collectionRole = parentRole.getParent().getFullPath();
break;
}
parentRole = parentRole.getParent();
} while (parentRole != null);
if ( collectionRole != null ) {
// This is a collection part i.e. to-many association
return declaringEntityPersister.getFactory().getMappingMetamodel()
.findCollectionDescriptor( collectionRole )
.getAttributeMapping();
}
// This is a simple to-one association
return declaringEntityPersister;
}
private ToOneAttributeMapping(
ToOneAttributeMapping original,
ManagedMappingType declaringType,