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 <csharp@georgialibraries.org>

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 147f0e7..ac6bbe2 100644 (file)
--- 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');