From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 12 Jan 2015 16:58:40 +0000 (-0500)
Subject: LP#1386347 stamping upgrade for hold clear copy maps
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=523ac8e56cfb93077e20ba8dfc0fdc0b9b1ec49c;p=evergreen%2Fmasslnc.git

LP#1386347 stamping upgrade for hold clear copy maps

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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e9f599d56f..54df622ae6 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0901', :eg_version); -- berick/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0902', :eg_version); -- miker/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0902.schema.clear_hold_copy_map.sql b/Open-ILS/src/sql/Pg/upgrade/0902.schema.clear_hold_copy_map.sql
new file mode 100644
index 0000000000..390b10e6ec
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0902.schema.clear_hold_copy_map.sql
@@ -0,0 +1,22 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0902', :eg_version);
+
+CREATE OR REPLACE FUNCTION action.hold_request_clear_map () RETURNS TRIGGER AS $$
+BEGIN
+  DELETE FROM action.hold_copy_map WHERE hold = NEW.id;
+  RETURN NEW;
+END;
+$$ LANGUAGE PLPGSQL;
+
+CREATE TRIGGER hold_request_clear_map_tgr
+    AFTER UPDATE ON action.hold_request
+    FOR EACH ROW
+    WHEN (
+        (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
+        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
+    )
+    EXECUTE PROCEDURE action.hold_request_clear_map();
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql
deleted file mode 100644
index 3604444e17..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-BEGIN;
-
-CREATE OR REPLACE FUNCTION action.hold_request_clear_map () RETURNS TRIGGER AS $$
-BEGIN
-  DELETE FROM action.hold_copy_map WHERE hold = NEW.id;
-  RETURN NEW;
-END;
-$$ LANGUAGE PLPGSQL;
-
-CREATE TRIGGER hold_request_clear_map_tgr
-    AFTER UPDATE ON action.hold_request
-    FOR EACH ROW
-    WHEN (
-        (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
-        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
-    )
-    EXECUTE PROCEDURE action.hold_request_clear_map();
-
-COMMIT;
-