From 6fb04aa242fb1318263681ea50c54a77bc26614b Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sun, 26 Jan 2020 01:43:48 -0500 Subject: [PATCH] more efficient account deletion --- .../src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java | 2 +- bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java | 2 +- utils/cobbzilla-wizard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java index 281eba98..84278615 100644 --- a/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java +++ b/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java @@ -63,7 +63,7 @@ public abstract class AccountOwnedEntityDAO public boolean dbFilterIncludeAll() { return false; } public void handleAccountDeletion(String accountUuid) { - findByAccount(accountUuid).forEach(e -> forceDelete(e.getUuid())); + getConfiguration().execSql("DELETE FROM "+tableName()+" WHERE account = ?", new Object[] {accountUuid}); } public void forceDelete(String uuid) { delete(uuid); } diff --git a/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java b/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java index 4d8898e0..88d1b9db 100644 --- a/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java +++ b/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java @@ -87,7 +87,7 @@ public class AppDataDAO extends AppTemplateEntityDAO { } public void deleteDevice(String uuid) { - getConfiguration().execSql("DELETE FROM app_data WHERE device = ?", new Object[] {uuid}); + getConfiguration().execSql("DELETE FROM "+tableName()+" WHERE device = ?", new Object[] {uuid}); } } diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index 0e0c1f38..c8ab68a8 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit 0e0c1f38345ec1055f8f07c3ca665fd041da27d5 +Subproject commit c8ab68a8d6f19531c217e1d2387c041ce2ed7ae4