From c3438b888d443de823542b231246cbf2e83a086b Mon Sep 17 00:00:00 2001
From: Rob Bygrave
Date: Mon, 13 Nov 2017 22:43:56 +1300
Subject: [PATCH] #995 - @OneToMany with constraints on the many side
---
.../server/persist/DefaultPersister.java | 61 +++++++++----------
.../cascade/TestPrivateOwnedCascadeOrder.java | 30 +++++++++
.../java/org/tests/model/basic/TSDetail.java | 18 ++++++
3 files changed, 78 insertions(+), 31 deletions(-)
create mode 100644 src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index aa27d8502..6e4059989 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -949,20 +949,15 @@ public final class DefaultPersister implements Persister {
Set> modifyRemovals = c.getModifyRemovals();
saveMany.modifyListenReset(c);
if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
-
- SpiTransaction t = saveMany.getTransaction();
- // increase depth for batching order
- t.depth(+1);
for (Object removedBean : modifyRemovals) {
if (removedBean instanceof EntityBean) {
EntityBean eb = (EntityBean) removedBean;
if (eb._ebean_getIntercept().isLoaded()) {
// only delete if the bean was loaded meaning that it is known to exist in the DB
- deleteRequest(createPublishRequest(removedBean, t, PersistRequest.Type.DELETE, saveMany.isPublish()));
+ deleteRequest(createPublishRequest(removedBean, saveMany.getTransaction(), PersistRequest.Type.DELETE, saveMany.isPublish()));
}
}
}
- t.depth(-1);
}
}
}
@@ -992,21 +987,23 @@ public final class DefaultPersister implements Persister {
targetDescriptor.preAllocateIds(collection.size());
}
- ArrayList