[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. 422ef9560227739be2c90d3af7434965e9ab1707

[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_11 has been updated
       via  422ef9560227739be2c90d3af7434965e9ab1707 (commit)
       via  f0349f16954d4a712e33bf021693926af02bffcd (commit)
       via  beb42bdb1a5ef87cac26f29f2e7d739c6a8e6c99 (commit)
      from  d3b5caa02dacc9453c114109c29faa674bc573c3 (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 422ef9560227739be2c90d3af7434965e9ab1707
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Tue Feb 14 00:44:06 2017 -0500

    LP#1663663: Stamping upgrade script for overlay merge profile fix
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c0b4613..70f7209 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 ('1005', :eg_version); -- csharp/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1012', :eg_version); -- gmcharlt/kmlussier
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql b/Open-ILS/src/sql/Pg/upgrade/1012.data.fix_full_overlay_vmp.sql
similarity index 80%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql
rename to Open-ILS/src/sql/Pg/upgrade/1012.data.fix_full_overlay_vmp.sql
index cd3537b..65fca46 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1012.data.fix_full_overlay_vmp.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1012', :eg_version);
 UPDATE vandelay.merge_profile
 SET preserve_spec = '901c',
     replace_spec = NULL

commit f0349f16954d4a712e33bf021693926af02bffcd
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Feb 10 11:45:12 2017 -0500

    LP#1663663: seed data upgrade script
    
    This patch attempts to repair the Full Overlay merge profile
    in 2.11 and 2.12-masterish databases.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql
new file mode 100644
index 0000000..cd3537b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_full_overlay_vmp.sql
@@ -0,0 +1,14 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+UPDATE vandelay.merge_profile
+SET preserve_spec = '901c',
+    replace_spec = NULL
+WHERE id = 2
+AND   name = oils_i18n_gettext(2, 'Full Overlay', 'vmp', 'name')
+AND   preserve_spec IS NULL
+AND   add_spec IS NULL
+AND   strip_spec IS NULL
+AND   replace_spec = '901c';
+
+COMMIT;

commit beb42bdb1a5ef87cac26f29f2e7d739c6a8e6c99
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Jan 5 16:36:21 2017 +0000

    LP#1663663: unbreak Full Overlay merge profile
    
    This patch fixes a regression introduced in 2.11 that had
    the effect of making the stock Full Overlay merge profile
    act like a match-only merge that also updates the bib source.
    
    To test
    -------
    [1] After applying the patches, verify that the Full Overlay
        merge profile now fullly updates the target bib record.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index e029263..daaee13 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -14558,7 +14558,7 @@ INSERT INTO action_trigger.environment (
 INSERT INTO vandelay.merge_profile (id, owner, name, replace_spec, update_bib_source) 
     VALUES (1, 1, oils_i18n_gettext(1, 'Match-Only Merge', 'vmp', 'name'), '901c', false);
 
-INSERT INTO vandelay.merge_profile (id, owner, name, replace_spec, update_bib_source) 
+INSERT INTO vandelay.merge_profile (id, owner, name, preserve_spec, update_bib_source)
     VALUES (2, 1, oils_i18n_gettext(2, 'Full Overlay', 'vmp', 'name'), '901c', true);
 
 SELECT SETVAL('vandelay.merge_profile_id_seq'::TEXT, 100);

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    2 +-
 .../Pg/upgrade/1012.data.fix_full_overlay_vmp.sql  |   14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1012.data.fix_full_overlay_vmp.sql


hooks/post-receive
-- 
Evergreen ILS