From efb5608d817ddbeac2a7c019abead38d7e6ec3bc Mon Sep 17 00:00:00 2001
From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 9 Mar 2010 17:22:52 +0000
Subject: [PATCH] 1. Add estimated_unit_price column to acq.lineitem.

2. Bring acq.acq_lineitem_history and acq.acq_purchase_order_history
into sync with their respective source tables.

M    Open-ILS/src/sql/Pg/200.schema.acq.sql
M    Open-ILS/src/sql/Pg/002.schema.config.sql
A    Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
M    Open-ILS/examples/fm_IDL.xml


git-svn-id: svn://svn.open-ils.org/ILS/trunk@15767 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/fm_IDL.xml                  |  9 ++++++++-
 Open-ILS/src/sql/Pg/002.schema.config.sql     |  2 +-
 Open-ILS/src/sql/Pg/200.schema.acq.sql        |  1 +
 .../0183.schema.acq-cancel-reason-history.sql | 20 +++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 63fdc9a313..e0ad0d6805 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -5166,6 +5166,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="State" name="state" reporter:datatype="text"/>
 			<field reporter:label="Order Date" name="order_date" reporter:datatype="timestamp"/>
 			<field reporter:label="Name" name="name" reporter:datatype="text"/>
+			<field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link"/>
 		</fields>
 		<links>
 			<link field="id" reltype="has_a" key="id" map="" class="acqpo"/>
@@ -5174,6 +5175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="editor" reltype="has_a" key="id" map="" class="au"/>
 			<link field="ordering_agency" reltype="has_a" key="id" map="" class="aou"/>
 			<link field="provider" reltype="has_a" key="id" map="" class="acqpro"/>
+			<link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER" context_field="ordering_agency"/>
@@ -5229,6 +5231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="Editor" name="editor" reporter:datatype="link" />
 			<field reporter:label="Claim Interval" name="claim_interval" reporter:datatype="interval" />
 			<field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link" />
+			<field reporter:label="Estimated Unit Price" name="estimated_unit_price" reporter:datatype="money" />
 			<field reporter:label="Item Count" name="item_count" oils_persist:virtual="true" reporter:datatype="int" />
 			<field reporter:label="Descriptive Attributes" name="attributes" oils_persist:virtual="true" reporter:datatype="link" />
 			<field reporter:label="Line Item Details" name="lineitem_details" oils_persist:virtual="true" reporter:datatype="link" />
@@ -5245,7 +5248,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="attributes" reltype="has_many" key="lineitem" map="" class="acqlia"/>
 			<link field="lineitem_details" reltype="has_many" key="lineitem" map="" class="acqlid"/>
 			<link field="lineitem_notes" reltype="has_many" key="lineitem" map="" class="acqlin"/>
-			<link field="cancel_reason" reltype="might_have" key="id" map="" class="acqcr"/>
+			<link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER CREATE_PICKLIST VIEW_PICKLIST">
@@ -5275,6 +5278,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="Source Label" name="source_label" reporter:datatype="text"/>
 			<field reporter:label="Item Count" name="item_count" reporter:datatype="int"/>
 			<field reporter:label="State" name="state" reporter:datatype="text"/>
+			<field reporter:label="Claim Interval" name="claim_interval" reporter:datatype="interval"/>
+			<field reporter:label="Cancel Reason" name="cancel_reason" reporter:datatype="link"/>
+			<field reporter:label="Estimated Unit Price" name="estimated_unit_price" reporter:datatype="money" />
 		</fields>
 		<links>
 			<link field="id" reltype="has_a" key="id" map="" class="jub"/>
@@ -5285,6 +5291,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="purchase_order" reltype="has_a" key="id" map="" class="acqpo"/>
 			<link field="picklist" reltype="has_a" key="id" map="" class="acqpl"/>
 			<link field="eg_bib_id" reltype="has_a" key="id" map="" class="bre"/>
+			<link field="cancel_reason" reltype="has_a" key="id" map="" class="acqcr"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <retrieve permission="CREATE_PURCHASE_ORDER VIEW_PURCHASE_ORDER">
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 24abc8bbc6..ba73b9b74d 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0182'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0183'); -- Scott McKellar
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 35abc2db15..047a0a4252 100644
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -454,6 +454,7 @@ CREATE TABLE acq.lineitem (
 	claim_interval      INTERVAL,
 	cancel_reason       INT                         REFERENCES acq.cancel_reason( id )
                                                     DEFERRABLE INITIALLY DEFERRED,
+	estimated_unit_price NUMERIC,
     CONSTRAINT picklist_or_po CHECK (picklist IS NOT NULL OR purchase_order IS NOT NULL)
 );
 CREATE INDEX li_po_idx ON acq.lineitem (purchase_order);
diff --git a/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql b/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
new file mode 100644
index 0000000000..7e3e2d841e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0183.schema.acq-cancel-reason-history.sql
@@ -0,0 +1,20 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0183'); -- Scott McKellar
+
+ALTER TABLE acq.lineitem
+	ADD COLUMN estimated_unit_price NUMERIC;
+
+ALTER TABLE acq.acq_lineitem_history
+	ADD COLUMN claim_interval INTERVAL;
+
+ALTER TABLE acq.acq_lineitem_history
+	ADD COLUMN cancel_reason INTEGER;
+
+ALTER TABLE acq.acq_lineitem_history
+	ADD COLUMN estimated_unit_price NUMERIC;
+
+ALTER TABLE acq.acq_purchase_order_history
+	ADD COLUMN cancel_reason INTEGER;
+
+COMMIT;
-- 
2.43.2