LP#1386347 clear maps at fulfillment time

For backwards compatibility with queue stats info on captured holds,
clear hold copy maps at fulfillment time instead of capture time, as
before.

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

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index d56c340..0a1c5bf 100644 (file)
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -416,7 +416,7 @@ CREATE TRIGGER hold_request_clear_map_tgr
     FOR EACH ROW
     WHEN (
         (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
-        OR (NEW.capture_time IS NOT NULL AND OLD.capture_time IS NULL)
+        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
     )
     EXECUTE PROCEDURE action.hold_request_clear_map();
 

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
index ee0191d..3604444 100644 (file)
--- 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
@@ -12,7 +12,7 @@ CREATE TRIGGER hold_request_clear_map_tgr
     FOR EACH ROW
     WHEN (
         (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
-        OR (NEW.capture_time IS NOT NULL AND OLD.capture_time IS NULL)
+        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
     )
     EXECUTE PROCEDURE action.hold_request_clear_map();