#1278 - Multi-tenant delete by id ... doesn't return 0 when no rows deleted

This commit is contained in:
Rob Bygrave committed 2018-02-26 13:16:20 +13:00
1 parent 91cb5a23fd
commit 347225efb2
4 files changed
+46 -30

No files matched your search

@@ -1741,7 +1741,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
private int deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent) {
return executeInTrans((txn) -> persister.deleteMany(beanType, ids, txn, permanent), transaction);
}
@@ -1758,7 +1757,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
*/
@Override
public boolean delete(Object bean, Transaction t) throws OptimisticLockException {
return persister.delete(checkEntityBean(bean), t, false);
// this should really return an int where -1 means jdbc batch/unknown
return persister.delete(checkEntityBean(bean), t, false) == 1;
}
@Override
@@ -1768,7 +1768,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
@Override
public boolean deletePermanent(Object bean, Transaction t) throws OptimisticLockException {
return persister.delete(checkEntityBean(bean), t, true);
// this should really return an int where -1 means jdbc batch/unknown
return persister.delete(checkEntityBean(bean), t, true) == 1;
}
@Override
@@ -46,7 +46,7 @@ public interface Persister {
/**
* Delete the bean.
*/
boolean delete(EntityBean entityBean, Transaction t, boolean permanent);
int delete(EntityBean entityBean, Transaction t, boolean permanent);
/**
* Delete multiple beans given a collection of Id values.
@@ -335,10 +335,9 @@ public final class DefaultPersister implements Persister {
/**
* Recursively delete the bean. This calls back to the EbeanServer.
*/
private void deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) {
private int deleteRecurse(EntityBean detailBean, Transaction t, boolean softDelete) {
Type deleteType = softDelete ? Type.SOFT_DELETE : Type.DELETE_PERMANENT;
deleteRequest(createRequest(detailBean, t, deleteType));
return deleteRequest(createRequest(detailBean, t, deleteType));
}
/**
@@ -505,7 +504,7 @@ public final class DefaultPersister implements Persister {
* Return false if the delete is executed without OCC and 0 rows were deleted.
*/
@Override
public boolean delete(EntityBean bean, Transaction t, boolean permanent) {
public int delete(EntityBean bean, Transaction t, boolean permanent) {
Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
PersistRequestBean<EntityBean> originalRequest = createRequest(bean, t, deleteType);
@@ -524,7 +523,7 @@ public final class DefaultPersister implements Persister {
/**
* Execute the delete request returning true if a delete occurred.
*/
private boolean deleteRequest(PersistRequestBean<?> req) {
private int deleteRequest(PersistRequestBean<?> req) {
return deleteRequest(req, null);
}
@@ -532,7 +531,7 @@ public final class DefaultPersister implements Persister {
* Execute the delete request support a second delete request for live and draft permanent delete.
* A common transaction is used across both requests.
*/
private boolean deleteRequest(PersistRequestBean<?> req, PersistRequestBean<?> draftReq) {
private int deleteRequest(PersistRequestBean<?> req, PersistRequestBean<?> draftReq) {
if (req.isRegisteredForDeleteBean()) {
// skip deleting bean. Used where cascade is on
@@ -540,21 +539,21 @@ public final class DefaultPersister implements Persister {
if (logger.isDebugEnabled()) {
logger.debug("skipping delete on alreadyRegistered " + req.getBean());
}
return false;
return 0;
}
try {
req.initTransIfRequiredWithBatchCascade();
boolean deleted = delete(req);
int rows = delete(req);
if (draftReq != null) {
// delete the 'draft' bean ('live' bean deleted first)
draftReq.setTrans(req.getTransaction());
deleted = delete(draftReq);
rows = delete(draftReq);
}
req.commitTransIfRequired();
req.flushBatchOnCascade();
return deleted;
return rows;
} catch (RuntimeException ex) {
req.rollbackTransIfRequired();
@@ -581,13 +580,7 @@ public final class DefaultPersister implements Persister {
BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
boolean softDelete = !permanent && descriptor.isSoftDelete();
if (descriptor.isMultiTenant()) {
// convert to a delete by bean
for (Object id : ids) {
EntityBean bean = descriptor.createEntityBean();
descriptor.convertSetId(id, bean);
deleteRecurse(bean, transaction, permanent);
}
return ids.size();
return deleteAsBeans(ids, transaction, permanent, descriptor);
}
ArrayList<Object> idList = new ArrayList<>(ids.size());
@@ -599,6 +592,25 @@ public final class DefaultPersister implements Persister {
return delete(descriptor, null, idList, transaction, softDelete);
}
/**
* Convert delete by Ids into delete many beans.
*/
private int deleteAsBeans(Collection<?> ids, Transaction transaction, boolean permanent, BeanDescriptor<?> descriptor) {
// convert to a delete by bean
int total = 0;
for (Object id : ids) {
EntityBean bean = descriptor.createEntityBean();
descriptor.convertSetId(id, bean);
int rowCount = deleteRecurse(bean, transaction, permanent);
if (rowCount == -1) {
total = -1;
} else if (total != -1){
total += rowCount;
}
}
return total;
}
/**
* Delete by Id.
*/
@@ -609,8 +621,7 @@ public final class DefaultPersister implements Persister {
// convert to a delete by bean
EntityBean bean = descriptor.createEntityBean();
descriptor.convertSetId(id, bean);
delete(bean, transaction, permanent);
return 1;
return delete(bean, transaction, permanent);
}
id = descriptor.convertId(id);
@@ -649,8 +660,7 @@ public final class DefaultPersister implements Persister {
if (bean == null) {
return 0;
} else {
deleteRecurse(bean, t, softDelete);
return 1;
return deleteRecurse(bean, t, softDelete);
}
}
}
@@ -782,7 +792,7 @@ public final class DefaultPersister implements Persister {
* Note that preDelete fires before the deletion of children.
* </p>
*/
private boolean delete(PersistRequestBean<?> request) {
private int delete(PersistRequestBean<?> request) {
DeleteUnloadedForeignKeys unloadedForeignKeys = null;
@@ -812,7 +822,7 @@ public final class DefaultPersister implements Persister {
}
// return true if using JDBC batch (as we can't tell until the batch is flushed)
return count != 0;
return count;
}
/**