From 8a6990b392080d92fd7ce9402adf78596518dbdd Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Thu, 13 Sep 2012 12:29:55 -0400 Subject: [PATCH] 2.1 doesn't have a config.upgrade_log.applied_to column Thanks to Michael Peters for finding that the 2.1.3 upgrade is impossible to apply as it currently stands. 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 +- Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql | 6 +++--- 4 files changed, 7 insertions(+), 7 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; diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql index bec59a45fd..8ee3b862f8 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1.2-2.1.3-upgrade-db.sql @@ -1,6 +1,6 @@ --Upgrade Script for 2.1.2 to 2.1.3 BEGIN; -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.1.3', :eg_version); +INSERT INTO config.upgrade_log (version) VALUES ('2.1.3'); -- Evergreen DB patch 0722.schema.acq-po-state-constraint.sql -- @@ -10,8 +10,8 @@ ALTER TABLE acq.purchase_order ADD CONSTRAINT valid_po_state CHECK (state IN ('new','pending','on-order','received','cancelled')); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0725', :eg_version); -- gmcharlt/denials -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0726', :eg_version); -- denials +INSERT INTO config.upgrade_log (version) VALUES ('0725'); -- gmcharlt/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