[open-ils-commits] r14020 - in trunk/Open-ILS: examples src/sql/Pg (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2009-09-15 11:22:40 -0400 (Tue, 15 Sep 2009)
New Revision: 14020

Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/sql/Pg/090.schema.action.sql
Log:
Add checkin_workstation column to action.circulation.

For changing an existing table:

ALTER TABLE action.circulation
ADD COLUMN checkin_workstation INT
	REFERENCES actor.workstation(id)
	ON DELETE SET NULL
	DEFERRABLE INITIALLY DEFERRED;


Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2009-09-15 14:41:28 UTC (rev 14019)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2009-09-15 15:22:40 UTC (rev 14020)
@@ -734,6 +734,7 @@
 		<links>
 			<link field="owning_lib" reltype="has_a" key="id" map="" class="aou"/>
 			<link field="circulations" reltype="has_many" key="workstation" map="" class="circ"/>
+			<link field="circulation_checkins" reltype="has_many" key="checkin_workstation" map="" class="circ"/>
 		</links>
 	</class>
 
@@ -2075,6 +2076,7 @@
 			<field reporter:label="Check Out Date/Time" name="xact_start" reporter:datatype="timestamp" />
 			<field reporter:label="Record Creation Date/Time" name="create_time" reporter:datatype="timestamp" />
 			<field reporter:label="Workstation" name="workstation" reporter:datatype="link"/>
+			<field reporter:label="Checkin Workstation" name="checkin_workstation" reporter:datatype="link"/>
 			<field reporter:label="Transaction Billings" name="billings" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Transaction Payments" name="payments" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Base Transaction" name="billable_transaction" oils_persist:virtual="true" reporter:datatype="link"/>
@@ -2099,6 +2101,7 @@
 			<link field="billing_total" reltype="might_have" key="xact" map="" class="rxbt"/>
 			<link field="payment_total" reltype="might_have" key="xact" map="" class="rxpt"/>
 			<link field="workstation" reltype="might_have" key="id" map="" class="aws"/>
+			<link field="checkin_workstation" reltype="might_have" key="id" map="" class="aws"/>
 		</links>
 	</class>
 	<class id="combcirc" controller="open-ils.cstore" oils_obj:fieldmapper="action::all_circulation" oils_persist:tablename="action.all_circulation" reporter:core="true" reporter:label="Combined Aged and Active Circulations" oils_persist:readonly="true">

Modified: trunk/Open-ILS/src/sql/Pg/090.schema.action.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/090.schema.action.sql	2009-09-15 14:41:28 UTC (rev 14019)
+++ trunk/Open-ILS/src/sql/Pg/090.schema.action.sql	2009-09-15 15:22:40 UTC (rev 14020)
@@ -126,6 +126,9 @@
 	stop_fines		TEXT				CHECK (stop_fines IN ('CHECKIN','CLAIMSRETURNED','LOST','MAXFINES','RENEW','LONGOVERDUE')),
 	workstation         INT        REFERENCES actor.workstation(id)
 	                               ON DELETE SET NULL
+								   DEFERRABLE INITIALLY DEFERRED,
+	checkin_workstation INT        REFERENCES actor.workstation(id)
+	                               ON DELETE SET NULL
 								   DEFERRABLE INITIALLY DEFERRED
 ) INHERITS (money.billable_xact);
 ALTER TABLE action.circulation ADD PRIMARY KEY (id);