Merge branch 'k3101'

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15998 dcc99617-32d9-48b4-a31d-7c20da2025e4

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 01bce6d..953a3d9 100644 (file)
--- 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 c703289..467b9c9 100644 (file)
--- 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;