From c84fdf6a7dd6a0385021ff9fdc3b3be159d90eb9 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Thu, 13 Sep 2012 12:46:23 -0400 Subject: [PATCH] rel_2_1 does not have a config.upgrade_log.applied_to column Thanks to Michael Peters for running into & reporting this problem when attempting to upgrade from 2.1.2 to 2.1.3! Fix the base scripts and schema creation. Signed-off-by: Dan Scott --- Open-ILS/src/sql/Pg/002.schema.config.sql | 4 ++-- Open-ILS/src/sql/Pg/upgrade/0725.schema.fix_maintain_901_regex.sql | 2 +- Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 414ca5c2ae..f017f70afa 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -57,8 +57,8 @@ CREATE TABLE config.upgrade_log ( install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() ); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0726', :eg_version); -- denials -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.1.3', :eg_version); +INSERT INTO config.upgrade_log (version) VALUES ('0726'); -- denials +INSERT INTO config.upgrade_log (version) VALUES ('2.1.3'); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/0725.schema.fix_maintain_901_regex.sql b/Open-ILS/src/sql/Pg/upgrade/0725.schema.fix_maintain_901_regex.sql index 2b0c206cdd..bdf8e66a88 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0725.schema.fix_maintain_901_regex.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0725.schema.fix_maintain_901_regex.sql @@ -1,6 +1,6 @@ BEGIN; -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0725', :eg_version); -- gmcharlt/denials +INSERT INTO config.upgrade_log (version) VALUES ('0725'); -- gmcharlt/denials CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$ use strict; diff --git a/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql b/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql index 2cd5c0d02e..534fab010a 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0726.schema.fix_maintain_901_regex.sql @@ -1,6 +1,6 @@ BEGIN; -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0726', :eg_version); -- denials +INSERT INTO config.upgrade_log (version) VALUES ('0726'); -- denials CREATE OR REPLACE FUNCTION evergreen.maintain_901 () RETURNS TRIGGER AS $func$ use strict; -- 2.11.0