From 8c1f182169370193e216e47856aaa6e1a7bdd360 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Wed, 9 Sep 2020 18:11:03 +0200 Subject: [PATCH] Allow now as second parameter of bulk delete --- .../src/main/java/bubble/dao/account/AccountDAO.java | 11 ++++++++--- utils/cobbzilla-wizard | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java index 768a8d51..2a56ea38 100644 --- a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java +++ b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java @@ -348,10 +348,15 @@ public class AccountDAO extends AbstractCRUDDAO implements SqlViewSearc log.info("copyTemplates completed: "+acct); } + private final String NETWORK_OWNER_ACCOUNT_UUID_PARAM = "__thisNetworkOwnerAccountUuid__"; + @Override public int bulkDeleteWhere(@NonNull final String whereClause, - @NonNull final Map parameters) { - parameters.put("thisNetworkOwnerAccountUuid", configuration.getThisNetwork().getAccount()); - return super.bulkDeleteWhere("uuid != :thisNetworkOwnerAccountUuid AND (" + whereClause + ")", parameters); + @Nullable final Map parameters) { + final Map enhancedParams = parameters != null ? parameters : new HashMap<>(); + enhancedParams.put(NETWORK_OWNER_ACCOUNT_UUID_PARAM, configuration.getThisNetwork().getAccount()); + + return super.bulkDeleteWhere("uuid != :" + NETWORK_OWNER_ACCOUNT_UUID_PARAM + " AND (" + whereClause + ")", + enhancedParams); } @Override public void delete(@Nullable final Collection accounts) { diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard index 6ad35ab2..14518c3c 160000 --- a/utils/cobbzilla-wizard +++ b/utils/cobbzilla-wizard @@ -1 +1 @@ -Subproject commit 6ad35ab2c21b8887f945b65cb224f99d870ab3ed +Subproject commit 14518c3c60a455df3542e68949d87dffc9e70ae7