1. Add new column parent_circ to action.circulation, to connect

renewals to the original circulations (or to previous renewals).

2. Add a pesky semicolon to a previous upgrade script.

M    Open-ILS/src/sql/Pg/090.schema.action.sql
A    Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
M    Open-ILS/src/sql/Pg/upgrade/0011.schema.circ-checkin-ws-and-scan-time.sql
M    Open-ILS/examples/fm_IDL.xml

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index ae30523..66f45f2 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2078,6 +2078,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Workstation" name="workstation" reporter:datatype="link"/>
                        <field reporter:label="Checkin Workstation" name="checkin_workstation" reporter:datatype="link"/>
                        <field reporter:label="Checkin Scan Date/Time" name="checkin_scan_time" reporter:datatype="timestamp" />
+                       <field reporter:label="Parent Circulation" name="parent_circ" 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"/>
@@ -2103,6 +2104,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <link field="payment_total" reltype="might_have" key="xact" map="" class="rxpt"/>
                        <link field="workstation" reltype="has_a" key="id" map="" class="aws"/>
                        <link field="checkin_workstation" reltype="has_a" key="id" map="" class="aws"/>
+                       <link field="parent_circ" reltype="might_have" key="id" map="" class="circ"/>
+                       <link field="renewals" reltype="has_many" key="parent_circ" map="" class="circ"/>
                </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">

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index 284b384..a9abdd2 100644 (file)
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -133,6 +133,10 @@ CREATE TABLE action.circulation (
        checkin_scan_time   TIMESTAMP WITH TIME ZONE
 ) INHERITS (money.billable_xact);
 ALTER TABLE action.circulation ADD PRIMARY KEY (id);
+ALTER TABLE action.circulation
+       ADD COLUMN parent_circ BIGINT
+       REFERENCES action.circulation( id )
+       DEFERRABLE INITIALLY DEFERRED;
 CREATE INDEX circ_open_xacts_idx ON action.circulation (usr) WHERE xact_finish IS NULL;
 CREATE INDEX circ_outstanding_idx ON action.circulation (usr) WHERE checkin_time IS NULL;
 CREATE INDEX circ_checkin_time ON "action".circulation (checkin_time) WHERE checkin_time IS NOT NULL;
@@ -141,6 +145,8 @@ CREATE INDEX circ_open_date_idx ON "action".circulation (xact_start) WHERE xact_
 CREATE INDEX circ_all_usr_idx       ON action.circulation ( usr );
 CREATE INDEX circ_circ_staff_idx    ON action.circulation ( circ_staff );
 CREATE INDEX circ_checkin_staff_idx ON action.circulation ( checkin_staff );
+CREATE UNIQUE INDEX circ_parent_idx ON action.circulation ( parent_circ ) WHERE parent_circ IS NOT NULL;
+
 
 CREATE TRIGGER mat_summary_create_tgr AFTER INSERT ON action.circulation FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_create ();
 CREATE TRIGGER mat_summary_change_tgr AFTER UPDATE ON action.circulation FOR EACH ROW EXECUTE PROCEDURE money.mat_summary_update ();
@@ -198,14 +204,14 @@ BEGIN
                circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
                stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
                max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
-               max_fine_rule, stop_fines)
+           max_fine_rule, stop_fines, checkin_workstation, checkin_scan_time, parent_circ)
          SELECT
                id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
                copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
                circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
                stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
                max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
-               max_fine_rule, stop_fines
+               max_fine_rule, stop_fines, checkin_workstation, checkin_scan_time, parent_circ
            FROM action.all_circulation WHERE id = OLD.id;
 
        RETURN OLD;

diff --git a/Open-ILS/src/sql/Pg/upgrade/0011.schema.circ-checkin-ws-and-scan-time.sql b/Open-ILS/src/sql/Pg/upgrade/0011.schema.circ-checkin-ws-and-scan-time.sql
index dc5bfe4..9f74838 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0011.schema.circ-checkin-ws-and-scan-time.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0011.schema.circ-checkin-ws-and-scan-time.sql
@@ -1,4 +1,4 @@
-BEGIN
+BEGIN;
 
 INSERT INTO config.upgrade_log (version) VALUES ('0011.schema.circ-checkin-ws-and-scan-time.sql');
 

diff --git a/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql b/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
new file mode 100644 (file)
index 0000000..0a45163
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
@@ -0,0 +1,36 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0012.schema.circ-parent-circ.sql');
+
+ALTER TABLE action.circulation
+ADD COLUMN parent_circ BIGINT
+       REFERENCES action.circulation(id)
+       DEFERRABLE INITIALLY DEFERRED;
+
+CREATE UNIQUE INDEX circ_parent_idx
+ON action.circulation( parent_circ )
+WHERE parent_circ IS NOT NULL;
+
+CREATE OR REPLACE FUNCTION action.age_circ_on_delete () RETURNS TRIGGER AS $$
+BEGIN
+    INSERT INTO action.aged_circulation
+        (id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
+        max_fine_rule, stop_fines, checkin_workstation, checkin_scan_time, parent_circ)
+      SELECT
+        id,usr_post_code, usr_home_ou, usr_profile, usr_birth_year, copy_call_number, copy_location,
+        copy_owning_lib, copy_circ_lib, copy_bib_record, xact_start, xact_finish, target_copy,
+        circ_lib, circ_staff, checkin_staff, checkin_lib, renewal_remaining, due_date,
+        stop_fines_time, checkin_time, create_time, duration, fine_interval, recuring_fine,
+        max_fine, phone_renewal, desk_renewal, opac_renewal, duration_rule, recuring_fine_rule,
+        max_fine_rule, stop_fines, checkin_workstation, checkin_scan_time, parent_circ
+        FROM action.all_circulation WHERE id = OLD.id;
+
+    RETURN OLD;
+END;
+$$ LANGUAGE 'plpgsql';
+
+COMMIT;