[open-ils-commits] r12840 - branches/rel_1_4_0/Open-ILS/src/sql/Pg (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2009-04-09 20:55:38 -0400 (Thu, 09 Apr 2009)
New Revision: 12840

Modified:
   branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
   branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql
Log:
updating upgrade scripts for 1.2-1.4 for deficiency noted by John Craig.  Thanks, John!

Modified: branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
===================================================================
--- branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql	2009-04-09 20:20:27 UTC (rev 12839)
+++ branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql	2009-04-10 00:55:38 UTC (rev 12840)
@@ -1361,7 +1361,6 @@
 	recurring_fine_rule	INT	NOT NULL REFERENCES config.rule_recuring_fine (id) DEFERRABLE INITIALLY DEFERRED,
 	max_fine_rule		INT	NOT NULL REFERENCES config.rule_max_fine (id) DEFERRABLE INITIALLY DEFERRED
 );
-INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule) VALUES (1,11,1,1);
 
 CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS INT AS $func$
 DECLARE
@@ -5729,3 +5728,10 @@
 
 COMMIT;
 
+INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule)
+ SELECT  d.id, f.id, m.id
+   FROM  config.rule_circ_duration d
+               JOIN config.rule_recuring_fine f ON (f.name = d.name)
+               JOIN config.rule_max_fine m ON (f.name = m.name)
+   WHERE m.name = 'default';
+

Modified: branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql
===================================================================
--- branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql	2009-04-09 20:20:27 UTC (rev 12839)
+++ branches/rel_1_4_0/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql	2009-04-10 00:55:38 UTC (rev 12840)
@@ -1359,7 +1359,6 @@
 	recurring_fine_rule	INT	NOT NULL REFERENCES config.rule_recuring_fine (id) DEFERRABLE INITIALLY DEFERRED,
 	max_fine_rule		INT	NOT NULL REFERENCES config.rule_max_fine (id) DEFERRABLE INITIALLY DEFERRED
 );
-INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule) VALUES (1,11,1,1);
 
 CREATE OR REPLACE FUNCTION action.find_circ_matrix_matchpoint( context_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS INT AS $func$
 DECLARE
@@ -5727,3 +5726,10 @@
 
 COMMIT;
 
+INSERT INTO config.circ_matrix_ruleset (matchpoint,duration_rule,recurring_fine_rule,max_fine_rule)
+ SELECT  d.id, f.id, m.id
+   FROM  config.rule_circ_duration d
+               JOIN config.rule_recuring_fine f ON (f.name = d.name)
+               JOIN config.rule_max_fine m ON (f.name = m.name)
+   WHERE m.name = 'default';
+