#1505 - Unidirectional @OneToOne orphanRemoval=true ... does not delete orphan that is replaced

This commit is contained in:
rob bygrave committed 2018-10-12 22:30:06 +13:00
1 parent 15cab24848
commit de9823b69b
4 files changed
+72 -4

No files matched your search

@@ -901,6 +901,11 @@ public final class DefaultPersister implements Persister {
BeanDescriptor<?> desc = request.getBeanDescriptor();
SpiTransaction t = request.getTransaction();
EntityBean orphanForRemoval = request.getImportedOrphanForRemoval();
if (orphanForRemoval != null) {
delete(orphanForRemoval, request.getTransaction(), true);
}
// exported ones with cascade save
for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
// check for partial beans
@@ -1097,6 +1102,10 @@ public final class DefaultPersister implements Persister {
// imported ones with save cascade
for (BeanPropertyAssocOne<?> prop : desc.propertiesOneImportedSave()) {
// check for partial objects
if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
request.setImportedOrphanForRemoval(prop);
}
if (request.isLoadedProperty(prop)) {
EntityBean detailBean = prop.getValueAsEntityBean(request.getEntityBean());
if (detailBean != null
@@ -1113,14 +1122,18 @@ public final class DefaultPersister implements Persister {
for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
Object origValue = request.getOrigValue(prop);
if (origValue instanceof EntityBean) {
delete((EntityBean) origValue, request.getTransaction(), true);
}
deleteOrphan(request, prop);
}
}
}
private void deleteOrphan(PersistRequestBean<?> request, BeanPropertyAssocOne<?> prop) {
Object origValue = request.getOrigValue(prop);
if (origValue instanceof EntityBean) {
delete((EntityBean) origValue, request.getTransaction(), true);
}
}
/**
* Support for loading any Imported Associated One properties that are not
* loaded but required for Delete cascade.