[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 4fb645fa9f12a9b435b18c90b8b392415387c87f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  4fb645fa9f12a9b435b18c90b8b392415387c87f (commit)
      from  d504c42e50235d8639cf8c78bde4784c3321e477 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4fb645fa9f12a9b435b18c90b8b392415387c87f
Author: Ben Shum <ben at evergreener.net>
Date:   Sat Aug 26 18:39:03 2017 -0400

    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 at 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 86f1fea..dd4a8dc 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 c3a6596..3d5a868 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

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 ...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%)


hooks/post-receive
-- 
Evergreen ILS