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

[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  5b7b588c3e41b522f39c46deb2ba48cc92acf9ea (commit)
       via  c541a4797457907be2382866888e93ed6edec6eb (commit)
      from  db2759bcf9de84f9c22a9499f4d8120c987746d1 (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 5b7b588c3e41b522f39c46deb2ba48cc92acf9ea
Author: Mike Rylander <mrylander at gmail.com>
Date:   Tue Feb 28 14:58:38 2012 -0500

    Stamping default-merge-profiles upgrade script
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 739754f..3eba010 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0677', :eg_version); -- tsbere/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0678', :eg_version); -- berick/miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql b/Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql
similarity index 68%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql
rename to Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql
index df3d014..81ca4b9 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql
@@ -1,8 +1,8 @@
--- Evergreen DB patch XXXX.data.vandelay-default-merge-profiles.sql
+-- Evergreen DB patch 0678.data.vandelay-default-merge-profiles.sql
 BEGIN;
 
 -- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0678', :eg_version);
 
 INSERT INTO vandelay.merge_profile (owner, name, replace_spec) 
     VALUES (1, 'Match-Only Merge', '901c');

commit c541a4797457907be2382866888e93ed6edec6eb
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Jan 19 11:03:44 2012 -0500

    Default Vandelay merge profiles
    
    Adds 2 default vandelay merge profiles, in part so users will have some
    useful sample data, but also so the community can have some
    basic/consistent profiles for documentation purposes.
    
    1. Match-Only Merge
    
    This is a no-op merge.  It's only purpose is to allow Vandelay, which
    requires a profile of some sort to do anything, to find matching
    records.  This is useful for importing holdings when the MARC from the
    source record is not desired.  It will also be useful in the
    (forthecoming) Vandelay-driven Acquisitions lineitem linking (LP
    pending).
    
    The target/incumbent record is not affected.
    
    2. Full Overlay
    
    Used for overlaying an entire inbound MARC record over its target
    record.  The target/incumbent record is completely replaced by the
    inbound record.
    
    For both, 901c is used because it's automatically updated on the target
    record to match the internal ID, regardless of any field
    preservation/stripping.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

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 79f88d5..0aacca1 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11306,4 +11306,10 @@ INSERT INTO action_trigger.environment (
     'owning_lib.billing_address'
 );
 
+INSERT INTO vandelay.merge_profile (owner, name, replace_spec) 
+    VALUES (1, 'Match-Only Merge', '901c');
+
+INSERT INTO vandelay.merge_profile (owner, name, preserve_spec) 
+    VALUES (1, 'Full Overlay', '901c');
+
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql
new file mode 100644
index 0000000..df3d014
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql
@@ -0,0 +1,14 @@
+-- Evergreen DB patch XXXX.data.vandelay-default-merge-profiles.sql
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO vandelay.merge_profile (owner, name, replace_spec) 
+    VALUES (1, 'Match-Only Merge', '901c');
+
+INSERT INTO vandelay.merge_profile (owner, name, preserve_spec) 
+    VALUES (1, 'Full Overlay', '901c');
+
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    6 ++++++
 .../0678.data.vandelay-default-merge-profiles.sql  |   14 ++++++++++++++
 3 files changed, 21 insertions(+), 1 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql


hooks/post-receive
-- 
Evergreen ILS