HHH-16821 Fail to delete entity with a composite id using an @IdClass with one of its fields mapped from the id of a @ManyToOne association
This commit is contained in:
parent
44439cad95
commit
2e4211e8eb
|
@ -635,6 +635,7 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme
|
|||
|
||||
for ( int i = 0; i < size; i++ ) {
|
||||
final AttributeMapping attributeMapping = attributeMappings.get( i );
|
||||
if ( !attributeMapping.isPluralAttributeMapping() ) {
|
||||
final Object attributeValue = values[i];
|
||||
span += attributeMapping.breakDownJdbcValues(
|
||||
attributeValue,
|
||||
|
@ -646,9 +647,11 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme
|
|||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for ( int i = 0; i < size; i++ ) {
|
||||
final AttributeMapping attributeMapping = attributeMappings.get( i );
|
||||
if ( !attributeMapping.isPluralAttributeMapping() ) {
|
||||
final Object attributeValue = domainValue == null
|
||||
? null
|
||||
: attributeMapping.getPropertyAccess().getGetter().get( domainValue );
|
||||
|
@ -662,6 +665,7 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme
|
|||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
return span;
|
||||
}
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ public class DeleteCoordinator extends AbstractMutationCoordinator {
|
|||
for ( int attributeIndex = 0; attributeIndex < versionability.length; attributeIndex++ ) {
|
||||
final AttributeMapping attribute;
|
||||
// only makes sense to lock on singular attributes which are not excluded from optimistic locking
|
||||
if ( versionability[attributeIndex] && ( attribute = persister.getAttributeMapping( attributeIndex ) ) instanceof SingularAttributeMapping ) {
|
||||
if ( versionability[attributeIndex] && !( attribute = persister.getAttributeMapping( attributeIndex ) ).isPluralAttributeMapping() ) {
|
||||
final Object loadedValue = loadedState[attributeIndex];
|
||||
if ( loadedValue != null ) {
|
||||
final String mutationTableName = persister.getAttributeMutationTableName( attributeIndex );
|
||||
|
@ -424,7 +424,7 @@ public class DeleteCoordinator extends AbstractMutationCoordinator {
|
|||
for ( int attributeIndex = 0; attributeIndex < versionability.length; attributeIndex++ ) {
|
||||
final AttributeMapping attribute;
|
||||
// only makes sense to lock on singular attributes which are not excluded from optimistic locking
|
||||
if ( versionability[attributeIndex] && ( attribute = persister.getAttributeMapping( attributeIndex ) ) instanceof SingularAttributeMapping ) {
|
||||
if ( versionability[attributeIndex] && !( attribute = persister.getAttributeMapping( attributeIndex ) ).isPluralAttributeMapping() ) {
|
||||
breakDownJdbcValues( mutationGroupBuilder, session, attribute, loadedState[attributeIndex] );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue