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

HHH-17504 - Ongoing JPA 32 work HHH-17350 - Work on hibernate-models, XSD and JAXB HHH-16114 - Improve boot metamodel binding HHH-15996 - Develop an abstraction for Annotation in annotation processing HHH-16012 - Develop an abstraction for domain model Class refs HHH-15997 - Support for dynamic models in orm.xml HHH-15698 - Support for entity-name in mapping.xsd

This commit is contained in:
Andrea Boriero 2024-03-12 17:26:41 +01:00 committed by Steve Ebersole
parent f75012d270
commit a223cc6439
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
View File

@ -316,7 +316,7 @@ class ColumnsBuilder {
*/ */
AnnotatedColumns overrideColumnFromMapperOrMapsIdProperty(boolean isId) { AnnotatedColumns overrideColumnFromMapperOrMapsIdProperty(boolean isId) {
final PropertyData override = final PropertyData override =
getPropertyOverriddenByMapperOrMapsId( isId, propertyHolder, property.getName(), buildingContext ); getPropertyOverriddenByMapperOrMapsId( isId, propertyHolder, property.resolveAttributeName(), buildingContext );
if ( override != null ) { if ( override != null ) {
final AnnotatedJoinColumns joinColumns = buildExplicitJoinColumns( override.getAttributeMember(), override ); final AnnotatedJoinColumns joinColumns = buildExplicitJoinColumns( override.getAttributeMember(), override );
return joinColumns == null return joinColumns == null

2
hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
View File

@ -109,7 +109,7 @@ public class EmbeddableBinder {
final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId( final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId(
propertyBinder.isId(), propertyBinder.isId(),
propertyHolder, propertyHolder,
property.getName(), property.resolveAttributeName(),
context context
); );
referencedEntityName = mapsIdProperty.getClassOrElementName(); referencedEntityName = mapsIdProperty.getClassOrElementName();

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

@ -1038,7 +1038,7 @@ public class PropertyBinder {
final PropertyData overridingProperty = getPropertyOverriddenByMapperOrMapsId( final PropertyData overridingProperty = getPropertyOverriddenByMapperOrMapsId(
propertyBinder.isId(), propertyBinder.isId(),
propertyHolder, propertyHolder,
property.getName(), property.resolveAttributeName(),
context context
); );
if ( overridingProperty != null ) { if ( overridingProperty != null ) {
@ -1185,7 +1185,7 @@ public class PropertyBinder {
final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId( final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId(
propertyBinder.isId(), propertyBinder.isId(),
propertyHolder, propertyHolder,
property.getName(), property.resolveAttributeName(),
context context
); );
final IdentifierGeneratorDefinition foreignGenerator = createForeignGenerator( mapsIdProperty ); final IdentifierGeneratorDefinition foreignGenerator = createForeignGenerator( mapsIdProperty );
@ -1233,7 +1233,7 @@ public class PropertyBinder {
final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId( final PropertyData mapsIdProperty = getPropertyOverriddenByMapperOrMapsId(
propertyBinder.isId(), propertyBinder.isId(),
propertyHolder, propertyHolder,
property.getName(), property.resolveAttributeName(),
context context
); );
propertyBinder.setReferencedEntityName( mapsIdProperty.getClassOrElementName() ); propertyBinder.setReferencedEntityName( mapsIdProperty.getClassOrElementName() );