From 1afa8fffeac5c30484ec035063ef750f9cad2ee7 Mon Sep 17 00:00:00 2001 From: miker Date: Fri, 10 Apr 2009 00:55:38 +0000 Subject: [PATCH] updating upgrade scripts for 1.2-1.4 for deficiency noted by John Craig. Thanks, John! git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4_0@12840 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql | 8 +++++++- Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql index 682713d2cd..583c662b72 100644 --- a/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql @@ -1361,7 +1361,6 @@ CREATE TABLE config.circ_matrix_ruleset ( 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 @@ Added Log Comment 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'; + diff --git a/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql index f7b2d09fd7..71d492eb0a 100644 --- a/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.2.4-1.4-upgrade-db.sql @@ -1359,7 +1359,6 @@ CREATE TABLE config.circ_matrix_ruleset ( 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 @@ Added Log Comment 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'; + -- 2.11.0