From 6024dbfa539865e94db23f6e8c9c93a06b5efee7 Mon Sep 17 00:00:00 2001 From: scottmk Date: Wed, 21 Oct 2009 17:58:28 +0000 Subject: [PATCH] 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 --- Open-ILS/examples/fm_IDL.xml | 1 + Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/005.schema.actors.sql | 3 ++- Open-ILS/src/sql/Pg/090.schema.action.sql | 3 ++- .../0043.schema.au-claims-never-checked-out-count.sql | 16 ++++++++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0043.schema.au-claims-never-checked-out-count.sql diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index b4d4c57906..fab623b8cf 100644 --- 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 + diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 47873ed30c..f8cf52451d 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 ('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 79cb5e6890..c12b480c3f 100644 --- 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 f5ece155ca..89fd9f5cd2 100644 --- 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 index 0000000000..f999c222ee --- /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; -- 2.11.0