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

HHH-17755 fix inferral of @IdClass column mapping from @MapsId

This commit is contained in:
Gavin King 2024-02-20 13:28:44 +01:00
parent 79635dffce
commit 5a134f0f38
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
View File

@ -1009,7 +1009,10 @@ public class PropertyBinder {
final boolean isComposite;
final boolean isOverridden;
final AnnotatedColumns actualColumns;
if ( propertyBinder.isId() || propertyHolder.isOrWithinEmbeddedId() || propertyHolder.isInIdClass() ) {
if ( isIdentifierMapper
|| propertyBinder.isId()
|| propertyHolder.isOrWithinEmbeddedId()
|| propertyHolder.isInIdClass() ) {
// the associated entity could be using an @IdClass making the overridden property a component
final PropertyData overridingProperty = getPropertyOverriddenByMapperOrMapsId(
propertyBinder.isId(),
@ -1019,8 +1022,7 @@ public class PropertyBinder {
);
if ( overridingProperty != null ) {
isOverridden = true;
final InheritanceState state = inheritanceStatePerClass.get( overridingProperty.getClassOrElement() );
isComposite = state != null ? state.hasIdClassOrEmbeddedId() : isEmbedded( property, returnedClass );
isComposite = isComposite( inheritanceStatePerClass, property, returnedClass, overridingProperty );
//Get the new column
actualColumns = columnsBuilder.overrideColumnFromMapperOrMapsIdProperty( propertyBinder.isId() );
}
@ -1100,6 +1102,15 @@ public class PropertyBinder {
return actualColumns;
}
private static boolean isComposite(
Map<XClass, InheritanceState> inheritanceStatePerClass,
XProperty property,
XClass returnedClass,
PropertyData overridingProperty) {
final InheritanceState state = inheritanceStatePerClass.get( overridingProperty.getClassOrElement() );
return state != null ? state.hasIdClassOrEmbeddedId() : isEmbedded( property, returnedClass );
}
private static void handleGeneratorsForOverriddenId(
PropertyHolder propertyHolder,
Map<String, IdentifierGeneratorDefinition> classGenerators,