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

HHH-16560 Nested @Embedded within an @EmbeddedId assertion failure

This commit is contained in:
Andrea Boriero 2023-05-25 14:25:03 +02:00 committed by Andrea Boriero
parent f8a31c1baf
commit 395050933f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java
View File

@ -13,6 +13,7 @@ import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
import org.hibernate.metamodel.mapping.VirtualModelPart; import org.hibernate.metamodel.mapping.VirtualModelPart;
import org.hibernate.metamodel.model.domain.NavigableRole;
import org.hibernate.metamodel.spi.ValueAccess; import org.hibernate.metamodel.spi.ValueAccess;
import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.property.access.spi.PropertyAccess;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
@ -66,7 +67,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
final int size = embeddableTypeDescriptor.getNumberOfFetchables(); final int size = embeddableTypeDescriptor.getNumberOfFetchables();
this.rowState = new Object[ size ]; this.rowState = new Object[ size ];
this.isPartOfKey = isPartOfKey( navigablePath ); this.isPartOfKey = isPartOfKey( embedded, navigablePath );
// We never want to create empty composites for the FK target or PK, otherwise collections would break // We never want to create empty composites for the FK target or PK, otherwise collections would break
this.createEmptyCompositesEnabled = !isPartOfKey && embeddableTypeDescriptor.isCreateEmptyCompositesEnabled(); this.createEmptyCompositesEnabled = !isPartOfKey && embeddableTypeDescriptor.isCreateEmptyCompositesEnabled();
@ -74,6 +75,12 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
this.assemblers = createAssemblers( resultDescriptor, creationState, embeddableTypeDescriptor ); this.assemblers = createAssemblers( resultDescriptor, creationState, embeddableTypeDescriptor );
} }
private static boolean isPartOfKey(EmbeddableValuedModelPart modelPart, NavigablePath navigablePath) {
return modelPart.isEntityIdentifierMapping()
|| isPartOfKey( navigablePath )
|| modelPart.getNavigableRole() != null && isPartOfKey( modelPart.getNavigableRole() );
}
private static boolean isPartOfKey(NavigablePath navigablePath) { private static boolean isPartOfKey(NavigablePath navigablePath) {
return ForeignKeyDescriptor.PART_NAME.equals( navigablePath.getLocalName() ) return ForeignKeyDescriptor.PART_NAME.equals( navigablePath.getLocalName() )
|| ForeignKeyDescriptor.TARGET_PART_NAME.equals( navigablePath.getLocalName() ) || ForeignKeyDescriptor.TARGET_PART_NAME.equals( navigablePath.getLocalName() )
@ -81,6 +88,12 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
|| navigablePath.getParent().getParent() != null && isPartOfKey( navigablePath.getParent() ); || navigablePath.getParent().getParent() != null && isPartOfKey( navigablePath.getParent() );
} }
private static boolean isPartOfKey(NavigableRole navigableRole) {
final NavigableRole parent = navigableRole.getParent();
return parent != null
&& ( parent.getLocalName().equals( EntityIdentifierMapping.ROLE_LOCAL_NAME ) || isPartOfKey( parent ) );
}
protected DomainResultAssembler<?>[] createAssemblers( protected DomainResultAssembler<?>[] createAssemblers(
EmbeddableResultGraphNode resultDescriptor, EmbeddableResultGraphNode resultDescriptor,
AssemblerCreationState creationState, AssemblerCreationState creationState,