From 4fb645fa9f12a9b435b18c90b8b392415387c87f Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Sat, 26 Aug 2017 18:39:03 -0400 Subject: [PATCH] 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 --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- ...r-merge-circ-history.sql => 1055.schema.user-merge-circ-history.sql} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{1065.schema.user-merge-circ-history.sql => 1055.schema.user-merge-circ-history.sql} (99%) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 86f1feab66..dd4a8dc73b 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -91,7 +91,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 ('1040', :eg_version); --gmcharlt/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 c3a65966be..3d5a8689ea 100644 --- 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 -- 2.11.0