From: Chris Sharp Date: Wed, 12 Oct 2016 11:05:32 +0000 (-0400) Subject: LP#1455606 - Also delete from config.org_unit_setting_type log. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=db1086310b236c366b9739f6b96b9877ad7fe2d8;p=working%2FEvergreen.git LP#1455606 - Also delete from config.org_unit_setting_type log. As Ben Shum pointed out, the upgrade script will fail if entries still exist for the removed setting, so we delete them too. Signed-off-by: Chris Sharp --- diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql index 147f0e7889..ac6bbe2682 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_unused_self_checkout_setting.sql @@ -8,6 +8,8 @@ DELETE FROM actor.org_unit_setting WHERE name = 'circ.selfcheck.require_patron_p DELETE FROM config.org_unit_setting_type WHERE name = 'circ.selfcheck.require_patron_password'; +DELETE FROM config.org_unit_setting_type_log WHERE field_name = 'circ.selfcheck.require_patron_password'; + DELETE FROM permission.usr_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password'); DELETE FROM permission.grp_perm_map WHERE perm IN (SELECT id FROM permission.perm_list WHERE code = 'UPDATE_ORG_UNIT_SETTING.circ.selfcheck.require_patron_password');