diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 9a8d0f23b..44e5a32ad 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -19,6 +19,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanManager; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.persist.BatchControl; @@ -131,6 +132,11 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ private boolean[] dirtyProperties; + /** + * Imported OneToOne orphan that needs to be deleted. + */ + private EntityBean orphanBean; + /** * Flag set when request is added to JDBC batch. */ @@ -1377,4 +1383,19 @@ public final class PersistRequestBean extends PersistRequest implements BeanP changeSet.addBeanUpdate(beanDescriptor, idValue, changes, updateNaturalKey, getVersion()); } } + + /** + * Set an orphan bean that needs to be deleted AFTER the request has persisted. + */ + public void setImportedOrphanForRemoval(BeanPropertyAssocOne prop) { + Object orphan = getOrigValue(prop); + if (orphan instanceof EntityBean) { + orphanBean = (EntityBean)orphan; + } + } + + public EntityBean getImportedOrphanForRemoval() { + return orphanBean; + } + } diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index bb0bac37d..add0870e8 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -229,6 +229,8 @@ public class AnnotationAssocOnes extends AnnotationParser { if (!"".equals(propAnn.mappedBy())) { prop.setOneToOneExported(); prop.setOrphanRemoval(propAnn.orphanRemoval()); + } else if (propAnn.orphanRemoval()) { + prop.setOrphanRemoval(true); } setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo()); diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 14f3b937b..fea311ad1 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -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. diff --git a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 1a16f50d6..5f7a6f3f4 100644 --- a/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -61,6 +61,38 @@ public class TestOneToOneOrphanStringId extends BaseTestCase { assertThat(deletes.get(0)).contains("delete from oto_atwo"); assertThat(deletes.get(1)).contains("delete from oto_aone"); } + + @Test + public void test_remove() { + + OtoAtwo b = new OtoAtwo("b3", "b test"); + Ebean.save(b); + + OtoAone a = new OtoAone("a3", "a test"); + b.setAone(a); + + Ebean.save(b); + + LoggedSqlCollector.start(); + + OtoAone a2 = new OtoAone("a4", "a test"); + b.setAone(a2); + Ebean.save(b); + + List sql = LoggedSqlCollector.current(); + assertThat(sql).hasSize(3); + assertThat(sql.get(0)).contains("insert into oto_aone"); + assertThat(sql.get(1)).contains("update oto_atwo set aone_id=? where id=?"); + assertThat(sql.get(2)).contains("delete from oto_aone where id=?"); + + Ebean.delete(b); + + List deletes = LoggedSqlCollector.stop(); + assertThat(deletes).hasSize(2); + assertThat(deletes.get(0)).contains("delete from oto_atwo"); + assertThat(deletes.get(1)).contains("delete from oto_aone"); + + } }