Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-18 00:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-17755 make @MapsId work correctly with @IdClass

Browse Source 
the @Id property was not getting populated
This commit is contained in:
Gavin King 2024-02-20 11:42:36 +01:00 committed by Marco Belladelli
parent 8215a28fcc
commit 78cd0175cc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
View File

@ -887,14 +887,16 @@ static PropertyData getPropertyOverriddenByMapperOrMapsId(
.toXClass( propertyHolder.getPersistentClass().getMappedClass() );
final InFlightMetadataCollector metadataCollector = buildingContext.getMetadataCollector();
if ( propertyHolder.isInIdClass() ) {
final PropertyData propertyData = metadataCollector.getPropertyAnnotatedWithIdAndToOne( mappedClass, propertyName );
return propertyData == null && buildingContext.getBuildingOptions().isSpecjProprietarySyntaxEnabled()
? metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, propertyName )
: propertyData;
}
else {
return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, isId ? "" : propertyName );
final PropertyData data = metadataCollector.getPropertyAnnotatedWithIdAndToOne( mappedClass, propertyName );
if ( data != null ) {
return data;
}
// TODO: is this branch even necessary?
else if ( buildingContext.getBuildingOptions().isSpecjProprietarySyntaxEnabled() ) {
return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, propertyName );
}
}
return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, isId ? "" : propertyName );
}
public static Map<String,String> toAliasTableMap(SqlFragmentAlias[] aliases){