LP#1712657: stamping schema update (fixup)

Originally committed with the wrong upgrade stamp number. Move that file,
and also update the baseline schema upgrade version.

Signed-off-by: Ben Shum <ben@evergreener.net>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 3679f20..684c9d1 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1054', :eg_version); -- miker/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1055', :eg_version); -- berick/phasefx
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1065.schema.user-merge-circ-history.sql b/Open-ILS/src/sql/Pg/upgrade/1055.schema.user-merge-circ-history.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/1065.schema.user-merge-circ-history.sql
rename to Open-ILS/src/sql/Pg/upgrade/1055.schema.user-merge-circ-history.sql
index c3a6596..3d5a868 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/1065.schema.user-merge-circ-history.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1055.schema.user-merge-circ-history.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('1065', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1055', :eg_version);
 
 CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$
 DECLARE