adding cancel_time support to hold_request

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 00301ec..11a4ac5 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -758,18 +758,6 @@
                        <link field="xact" reltype="has_a" key="id" map="" class="mbt"/>
                </links>
        </class>
-       <class id="ap" oils_obj:fieldmapper="actor::profile" oils_persist:tablename="actor.profile">
-               <fields oils_persist:primary="id" oils_persist:sequence="actor.profile_id_seq">
-                       <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
-                       <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
-                       <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
-                       <field name="id" oils_obj:array_position="3" oils_persist:virtual="false" />
-                       <field name="name" oils_obj:array_position="4" oils_persist:virtual="false" />
-               </fields>
-               <links>
-                       <link field="users" reltype="has_many" key="profile" map="" class="au"/>
-               </links>
-       </class>
        <class id="mfp" oils_obj:fieldmapper="money::forgive_payment" oils_persist:tablename="money.forgive_payment">
                <fields oils_persist:primary="id" oils_persist:sequence="money.payment_id_seq">
                        <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
@@ -1112,6 +1100,7 @@
                        <field name="selection_ou" oils_obj:array_position="22" oils_persist:virtual="false" />
                        <field name="target" oils_obj:array_position="23" oils_persist:virtual="false" />
                        <field name="usr" oils_obj:array_position="24" oils_persist:virtual="false" />
+                       <field name="cancel_time" oils_obj:array_position="25" oils_persist:virtual="false" />
                </fields>
                <links>
                        <link field="fulfillment_lib" reltype="has_a" key="id" map="" class="aou"/>

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
index 23cf0b3..61d1f46 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
@@ -87,7 +87,7 @@ __PACKAGE__->table('action_hold_request');
 __PACKAGE__->columns(Primary => 'id');
 __PACKAGE__->columns(Essential => qw/request_time capture_time fulfillment_time
                                     prev_check_time expire_time requestor usr
-                                    hold_type holdable_formats target
+                                    hold_type holdable_formats target cancel_time
                                     phone_notify email_notify selection_depth
                                     pickup_lib current_copy request_lib
                                     fulfillment_staff fulfillment_lib selection_ou/);

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index 3eaa4ed..079fad4 100644 (file)
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -153,6 +153,7 @@ CREATE TABLE action.hold_request (
        return_time             TIMESTAMP WITH TIME ZONE,
        prev_check_time         TIMESTAMP WITH TIME ZONE,
        expire_time             TIMESTAMP WITH TIME ZONE,
+       cancel_time             TIMESTAMP WITH TIME ZONE,
        target                  BIGINT                          NOT NULL, -- see hold_type
        current_copy            BIGINT                          REFERENCES asset.copy (id) ON DELETE SET NULL,
        fulfillment_staff       INT                             REFERENCES actor.usr (id),