[open-ils-commits] [GIT] Evergreen ILS branch master updated. ebf932e1444d8c56fc66a78a12042050534ebc9d

[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, master has been updated
       via  ebf932e1444d8c56fc66a78a12042050534ebc9d (commit)
      from  a95db71be053cf97b1b710c5f8ecee576673fbee (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 ebf932e1444d8c56fc66a78a12042050534ebc9d
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 3679f20..684c9d1 100644
--- 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
--- 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