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

HHH-17755 make @MapsId work correctly with @IdClass 

the @Id property was not getting populated
This commit is contained in:
Gavin King 2024-02-20 11:42:36 +01:00
parent 3812641430
commit 312ed3c3f3
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 @@ public class BinderHelper {
.toXClass( propertyHolder.getPersistentClass().getMappedClass() ); .toXClass( propertyHolder.getPersistentClass().getMappedClass() );
final InFlightMetadataCollector metadataCollector = buildingContext.getMetadataCollector(); final InFlightMetadataCollector metadataCollector = buildingContext.getMetadataCollector();
if ( propertyHolder.isInIdClass() ) { if ( propertyHolder.isInIdClass() ) {
final PropertyData propertyData = metadataCollector.getPropertyAnnotatedWithIdAndToOne( mappedClass, propertyName ); final PropertyData data = metadataCollector.getPropertyAnnotatedWithIdAndToOne( mappedClass, propertyName );
return propertyData == null && buildingContext.getBuildingOptions().isSpecjProprietarySyntaxEnabled() if ( data != null ) {
? metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, propertyName ) return data;
: propertyData; }
} // TODO: is this branch even necessary?
else { else if ( buildingContext.getBuildingOptions().isSpecjProprietarySyntaxEnabled() ) {
return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, isId ? "" : propertyName ); return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, propertyName );
}
} }
return metadataCollector.getPropertyAnnotatedWithMapsId( mappedClass, isId ? "" : propertyName );
} }
public static Map<String,String> toAliasTableMap(SqlFragmentAlias[] aliases){ public static Map<String,String> toAliasTableMap(SqlFragmentAlias[] aliases){