1. Add column to actor.usr: claims_never_checked_out_count.

2. Add valid value 'CLAIMSNEVERCHECKEDOUT' to check constraint
for action.circulation.stop_fines.

M    Open-ILS/src/sql/Pg/090.schema.action.sql
M    Open-ILS/src/sql/Pg/005.schema.actors.sql
M    Open-ILS/src/sql/Pg/002.schema.config.sql
A    Open-ILS/src/sql/Pg/upgrade/0043.schema.au-claims-never-checked-out-count.sql
M    Open-ILS/examples/fm_IDL.xml

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index b4d4c57..fab623b 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -1650,6 +1650,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Physical Address" name="billing_address" reporter:datatype="link"/>
                        <field reporter:label="Current Library Card" name="card" reporter:datatype="link"/>
                        <field reporter:label="Claims-returned Count" name="claims_returned_count" reporter:datatype="int" />
+                       <field reporter:label="Claims Never Checked Out Count" name="claims_never_checked_out_count" reporter:datatype="int" />
                        <field reporter:label="Record Creation Date/Time" name="create_date" reporter:datatype="timestamp"/>
                        <field reporter:label="User Credit Balance" name="credit_forward_balance" reporter:datatype="money" />
                        <field reporter:label="Daytime Phone" name="day_phone"  reporter:datatype="text"/>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 47873ed..f8cf524 100644 (file)
--- 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 ('0042'); -- berick
+INSERT INTO config.upgrade_log (version) VALUES ('0043'); -- Scott McKellar
 
 
 CREATE TABLE config.bib_source (

diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql
index 79cb5e6..c12b480 100644 (file)
--- a/Open-ILS/src/sql/Pg/005.schema.actors.sql
+++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql
@@ -64,7 +64,8 @@ CREATE TABLE actor.usr (
        last_xact_id            TEXT                            NOT NULL DEFAULT 'none',
        alert_message           TEXT,
        create_date             TIMESTAMP WITH TIME ZONE        NOT NULL DEFAULT now(),
-       expire_date             TIMESTAMP WITH TIME ZONE        NOT NULL DEFAULT (now() + '3 years'::INTERVAL)
+       expire_date             TIMESTAMP WITH TIME ZONE        NOT NULL DEFAULT (now() + '3 years'::INTERVAL),
+       claims_never_checked_out_count  INT         NOT NULL DEFAULT 0
 );
 COMMENT ON TABLE actor.usr IS $$
 /*

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index f5ece15..89fd9f5 100644 (file)
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -123,7 +123,8 @@ CREATE TABLE action.circulation (
        duration_rule           TEXT                            NOT NULL, -- name of "circ duration" rule
        recuring_fine_rule      TEXT                            NOT NULL, -- name of "circ fine" rule
        max_fine_rule           TEXT                            NOT NULL, -- name of "max fine" rule
-       stop_fines              TEXT                            CHECK (stop_fines IN ('CHECKIN','CLAIMSRETURNED','LOST','MAXFINES','RENEW','LONGOVERDUE')),
+       stop_fines              TEXT                            CHECK (stop_fines IN (
+                                              'CHECKIN','CLAIMSRETURNED','LOST','MAXFINES','RENEW','LONGOVERDUE','CLAIMSNEVERCHECKEDOUT')),
        workstation         INT        REFERENCES actor.workstation(id)
                                       ON DELETE SET NULL
                                                                   DEFERRABLE INITIALLY DEFERRED,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0043.schema.au-claims-never-checked-out-count.sql b/Open-ILS/src/sql/Pg/upgrade/0043.schema.au-claims-never-checked-out-count.sql
new file mode 100644 (file)
index 0000000..f999c22
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0043.schema.au-claims-never-checked-out-count.sql
@@ -0,0 +1,16 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0043'); -- Scott McKellar
+
+ALTER TABLE actor.usr ADD COLUMN
+       claims_never_checked_out_count  INT         NOT NULL DEFAULT 0;
+
+ALTER TABLE action.circulation
+DROP CONSTRAINT circulation_stop_fines_check;
+
+ALTER TABLE action.circulation
+       ADD CONSTRAINT circulation_stop_fines_check
+       CHECK (stop_fines IN (
+        'CHECKIN','CLAIMSRETURNED','LOST','MAXFINES','RENEW','LONGOVERDUE','CLAIMSNEVERCHECKEDOUT'));
+
+COMMIT;