Adding DROP TRIGGER IF EXISTS to allow for smooth upgrades.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql
index 2381fdb..a7e389f 100644 (file)
--- a/Open-ILS/src/sql/Pg/040.schema.asset.sql
+++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql
@@ -190,6 +190,8 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+DROP TRIGGER IF EXISTS acp_location_fixer_trig ON asset.copy;
+
 CREATE TRIGGER acp_location_fixer_trig
     BEFORE INSERT OR UPDATE OF location, call_number, circ_lib ON asset.copy
     FOR EACH ROW EXECUTE PROCEDURE asset.acp_location_fixer();

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql
index c0a8fc5..f2d4011 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.correct_copy_location.sql
@@ -19,6 +19,8 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+DROP TRIGGER IF EXISTS acp_location_fixer_trig ON asset.copy;
+
 CREATE TRIGGER acp_location_fixer_trig
     BEFORE INSERT OR UPDATE OF location, call_number, circ_lib ON asset.copy
     FOR EACH ROW EXECUTE PROCEDURE asset.acp_location_fixer();