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

HHH-9055 - Binding support for IdClass and MapsId needs a complete review

This commit is contained in:
Steve Ebersole 2014-04-24 16:33:13 -05:00
parent 3cec19a274
commit f88b53cf9e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
View File

@ -296,7 +296,8 @@ public final class AuditMetadataGenerator {
else if ( type instanceof OneToOneType ) { else if ( type instanceof OneToOneType ) {
final OneToOneAttributeBinding oneToOneAttributeBinding = (OneToOneAttributeBinding) attributeBinding; final OneToOneAttributeBinding oneToOneAttributeBinding = (OneToOneAttributeBinding) attributeBinding;
if ( oneToOneAttributeBinding.getReferencedAttributeBinding().getAttribute().getName() != null && if ( oneToOneAttributeBinding.getReferencedAttributeBinding().getAttribute().getName() != null &&
!oneToOneAttributeBinding.getReferencedEntityBinding().getHierarchyDetails().getEntityIdentifier() !oneToOneAttributeBinding.getReferencedEntityBinding().getHierarchyDetails()
.getEntityIdentifier().getEntityIdentifierBinding()
.isIdentifierAttributeBinding( oneToOneAttributeBinding.getReferencedAttributeBinding() ) ) { .isIdentifierAttributeBinding( oneToOneAttributeBinding.getReferencedAttributeBinding() ) ) {
toOneRelationMetadataGenerator.addOneToOneNotOwning( toOneRelationMetadataGenerator.addOneToOneNotOwning(
propertyAuditingData, propertyAuditingData,

1
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
View File

@ -109,6 +109,7 @@ public class ChildPrimaryKeyJoinAuditing extends BaseEnversJPAFunctionalTestCase
) )
.getHierarchyDetails() .getHierarchyDetails()
.getEntityIdentifier() .getEntityIdentifier()
.getEntityIdentifierBinding()
.getAttributeBinding() .getAttributeBinding()
.getValues() .getValues()
.get( 0 ) ).getColumnName().getText() .get( 0 ) ).getColumnName().getText()

2
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
View File

@ -54,7 +54,7 @@ public class LongRevEntityInheritanceChildAuditing extends BaseEnversJPAFunction
// We need the second column // We need the second column
Iterator childEntityKeyColumnsIterator = getMetadata() Iterator childEntityKeyColumnsIterator = getMetadata()
.getEntityBinding( "org.hibernate.envers.test.integration.inheritance.joined.ChildEntity_AUD" ) .getEntityBinding( "org.hibernate.envers.test.integration.inheritance.joined.ChildEntity_AUD" )
.getHierarchyDetails().getEntityIdentifier().getAttributeBinding().getValues().iterator(); .getHierarchyDetails().getEntityIdentifier().getEntityIdentifierBinding().getAttributeBinding().getValues().iterator();
childEntityKeyColumnsIterator.next(); childEntityKeyColumnsIterator.next();
Value second = (Value) childEntityKeyColumnsIterator.next(); Value second = (Value) childEntityKeyColumnsIterator.next();