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 <dscott@laurentian.ca>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e1f8381..0bca3c4 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -59,6 +59,7 @@ CREATE TABLE config.upgrade_log (
     applied_to      TEXT
 );
 
+<<<<<<< HEAD
 CREATE TABLE config.db_patch_dependencies (
   db_patch      TEXT PRIMARY KEY,
   supersedes    TEXT[],
@@ -88,6 +89,10 @@ CREATE TRIGGER no_overlapping_deps
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0738', :eg_version); -- senator/dbwells
+=======
+INSERT INTO config.upgrade_log (version) VALUES ('0726'); -- denials
+INSERT INTO config.upgrade_log (version) VALUES ('2.1.3');
+>>>>>>> 8a6990b... 2.1 doesn't have a config.upgrade_log.applied_to column
 
 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 2b0c206..bdf8e66 100644 (file)
--- 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 2cd5c0d..534fab0 100644 (file)
--- 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 bec59a4..8ee3b86 100644 (file)
--- 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;