[open-ils-commits] r18544 - in branches/rel_2_0/Open-ILS/src/sql/Pg: . upgrade (gmc)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Nov 1 11:41:00 EDT 2010


Author: gmc
Date: 2010-11-01 11:40:57 -0400 (Mon, 01 Nov 2010)
New Revision: 18544

Added:
   branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0450.schema.drop-balance-check-constraints.sql
Modified:
   branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/200.schema.acq.sql
Log:
let libraries allow funds to be overcommitted

The check constraints on the balance warning and
stop limits were too strict - a library can validly
choose to permit a fund to have a commitment greater
than 100% of its allocation

Signed-off-by: Galen Charlton <gmc at esilibrary.com>


Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-11-01 15:39:39 UTC (rev 18543)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-11-01 15:40:57 UTC (rev 18544)
@@ -70,7 +70,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0449'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0450'); -- gmc
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-11-01 15:39:39 UTC (rev 18543)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-11-01 15:40:57 UTC (rev 18544)
@@ -9404,14 +9404,10 @@
 	ADD COLUMN active BOOL NOT NULL DEFAULT TRUE;
 
 ALTER TABLE acq.fund
-    ADD COLUMN balance_warning_percent INT
-    CONSTRAINT balance_warning_percent_limit
-        CHECK( balance_warning_percent <= 100 );
+    ADD COLUMN balance_warning_percent INT;
 
 ALTER TABLE acq.fund
-    ADD COLUMN balance_stop_percent INT
-    CONSTRAINT balance_stop_percent_limit
-        CHECK( balance_stop_percent <= 100 );
+    ADD COLUMN balance_stop_percent INT;
 
 CREATE VIEW acq.ordered_funding_source_credit AS
 	SELECT

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/200.schema.acq.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/200.schema.acq.sql	2010-11-01 15:39:39 UTC (rev 18543)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/200.schema.acq.sql	2010-11-01 15:40:57 UTC (rev 18544)
@@ -225,10 +225,8 @@
 	rollover        BOOL    NOT NULL DEFAULT FALSE,
 	propagate       BOOL    NOT NULL DEFAULT TRUE,
 	active          BOOL    NOT NULL DEFAULT TRUE,
-	balance_warning_percent INT CONSTRAINT balance_warning_percent_limit
-	                            CHECK( balance_warning_percent <= 100 ),
-	balance_stop_percent    INT CONSTRAINT balance_stop_percent_limit
-	                            CHECK( balance_stop_percent <= 100 ),
+	balance_warning_percent INT,
+	balance_stop_percent    INT,
     CONSTRAINT name_once_per_org_year UNIQUE (org,name,year),
     CONSTRAINT code_once_per_org_year UNIQUE (org, code, year),
 	CONSTRAINT acq_fund_rollover_implies_propagate CHECK ( propagate OR NOT rollover )

Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0450.schema.drop-balance-check-constraints.sql (from rev 18543, trunk/Open-ILS/src/sql/Pg/upgrade/0450.schema.drop-balance-check-constraints.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0450.schema.drop-balance-check-constraints.sql	                        (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0450.schema.drop-balance-check-constraints.sql	2010-11-01 15:40:57 UTC (rev 18544)
@@ -0,0 +1,9 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0450'); -- gmc
+
+-- libraries can choose to overcommit funds
+ALTER TABLE acq.fund DROP CONSTRAINT balance_warning_percent_limit;
+ALTER TABLE acq.fund DROP CONSTRAINT balance_stop_percent_limit;
+
+COMMIT;



More information about the open-ils-commits mailing list