[open-ils-commits] r15998 - trunk/Open-ILS/src/sql/Pg/upgrade (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-03-25 17:59:31 -0400 (Thu, 25 Mar 2010)
New Revision: 15998

Modified:
   trunk/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql
   trunk/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql
Log:
Merge branch 'k3101'

Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql	2010-03-25 21:27:05 UTC (rev 15997)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0211.schema.acq.replace-claim-interval.sql	2010-03-25 21:59:31 UTC (rev 15998)
@@ -3,7 +3,7 @@
 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

Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql	2010-03-25 21:27:05 UTC (rev 15997)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0214.schema.acq.replace-claim-interval.sql	2010-03-25 21:59:31 UTC (rev 15998)
@@ -10,4 +10,6 @@
 		REFERENCES acq.claim_policy
 		DEFERRABLE INITIALLY DEFERRED;
 
+SELECT acq.create_acq_lifecycle('acq', 'lineitem');
+
 COMMIT;