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

HHH-16209 Identically-named association in entity root and embeddable leads to mixup during association loading

This commit is contained in:
Andrea Boriero 2023-02-28 10:12:02 +01:00 committed by Andrea Boriero
parent fd7b599d6b
commit 04ce594959
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,7 +1068,10 @@ public class ToOneAttributeMapping
NavigablePath navigablePath = parentNavigablePath.trimSuffix( bidirectionalAttributePath ); NavigablePath navigablePath = parentNavigablePath.trimSuffix( bidirectionalAttributePath );
if ( navigablePath != null ) { if ( navigablePath != null ) {
if ( navigablePath.getLocalName().equals( EntityIdentifierMapping.ROLE_LOCAL_NAME ) ) { final String localName = navigablePath.getLocalName();
if ( localName.equals( EntityIdentifierMapping.ROLE_LOCAL_NAME )
|| localName.equals( ForeignKeyDescriptor.PART_NAME )
|| localName.equals( ForeignKeyDescriptor.TARGET_PART_NAME ) ) {
navigablePath = navigablePath.getParent(); navigablePath = navigablePath.getParent();
} }
return creationState.resolveModelPart( navigablePath ).getPartMappingType() == entityMappingType; return creationState.resolveModelPart( navigablePath ).getPartMappingType() == entityMappingType;