Missing db upgrade number bump plus backport fix

Signed-off-by: Dan Wells <dbw2@calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2ade165..67f185a 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0541'); -- dbwells
+INSERT INTO config.upgrade_log (version) VALUES ('0542'); -- phasefx
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0542.data.perm-list.misc-cat.sql b/Open-ILS/src/sql/Pg/upgrade/0542.data.perm-list.misc-cat.sql
index e9f3e8f..bd56ad3 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0542.data.perm-list.misc-cat.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0542.data.perm-list.misc-cat.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('0542', :eg_version); -- phasefx
+INSERT INTO config.upgrade_log (version) VALUES ('0542'); -- phasefx
 
 INSERT INTO permission.perm_list VALUES
     (485, 'CREATE_VOLUME_SUFFIX', oils_i18n_gettext(485, 'Create suffix label definition.', 'ppl', 'description'))