From fea1263bd897e0a27e3bdb2f17f1a0d42870aa85 Mon Sep 17 00:00:00 2001 From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Thu, 25 Mar 2010 21:59:31 +0000 Subject: [PATCH] Merge branch 'k3101' git-svn-id: svn://svn.open-ils.org/ILS/trunk@15998 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql | 2 +- Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql b/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql index 01bce6d7a6..953a3d94ea 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql @@ -3,7 +3,7 @@ BEGIN; INSERT INTO config.upgrade_log (version) VALUES ('0211'); -- Scott McKellar ALTER TABLE acq.lineitem - DROP COLUMN claim_interval; + DROP COLUMN claim_interval CASCADE; ALTER TABLE acq.lineitem ADD COLUMN claim_policy INT diff --git a/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql b/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql index c7032891f3..467b9c969a 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql @@ -10,4 +10,6 @@ ALTER TABLE acq.acq_lineitem_history REFERENCES acq.claim_policy DEFERRABLE INITIALLY DEFERRED; +SELECT acq.create_acq_lifecycle('acq', 'lineitem'); + COMMIT; -- 2.11.0