LP#1750894 SQL cleanup ; UNDO fixes

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql
index 85b3b0d..ee68b12 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.workstation-settings.sql
@@ -1,7 +1,5 @@
 BEGIN;
 
-/*
-
 CREATE TYPE actor.cascade_setting_summary AS (
     name TEXT,
     value JSON,
@@ -76,8 +74,6 @@ CREATE CONSTRAINT TRIGGER check_setting_is_usr_or_ws
   AFTER INSERT OR UPDATE ON config.workstation_setting_type
   FOR EACH ROW EXECUTE PROCEDURE config.setting_is_user_or_ws();
 
-  */
-
 CREATE OR REPLACE FUNCTION actor.get_cascade_setting(
     setting_name TEXT, org_id INT, user_id INT, workstation_id INT) 
     RETURNS actor.cascade_setting_summary AS

diff --git a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.schema.workstation-settings.UNDO.sql b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.schema.workstation-settings.UNDO.sql
index 2340d17..3713c1f 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.schema.workstation-settings.UNDO.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.schema.workstation-settings.UNDO.sql
@@ -1,13 +1,14 @@
 BEGIN;
 
-DROP FUNCTION actor.get_setting(TEXT, INT, INT, INT);
-DROP FUNCTION actor.get_setting_batch(TEXT[], INT, INT, INT);
+DROP FUNCTION IF EXISTS actor.get_cascade_setting_batch(TEXT[], INT, INT, INT);
+DROP FUNCTION IF EXISTS actor.get_cascade_setting(TEXT, INT, INT, INT);
 
-DROP TRIGGER IF EXISTS check_setting_is_usr_or_ws ON actor.workstation_setting;
-DROP TRIGGER IF EXISTS check_setting_is_usr_or_ws ON actor.usr_setting;
+DROP TRIGGER IF EXISTS check_setting_is_usr_or_ws ON config.workstation_setting_type;
+DROP TRIGGER IF EXISTS check_setting_is_usr_or_ws ON config.usr_setting_type;
 DROP FUNCTION IF EXISTS config.setting_is_user_or_ws();
-DROP TABLE actor.workstation_setting;
-DROP TABLE config.workstation_setting_type;
+DROP TABLE IF EXISTS actor.workstation_setting;
+DROP TABLE IF EXISTS config.workstation_setting_type;
+DROP TYPE IF EXISTS actor.cascade_setting_summary;
 
 COMMIT;