From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 28 Feb 2012 19:58:38 +0000 (-0500)
Subject: Stamping default-merge-profiles upgrade script
X-Git-Tag: sprint4-merge-nov22~4576
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5b7b588c3e41b522f39c46deb2ba48cc92acf9ea;p=working%2FEvergreen.git

Stamping default-merge-profiles upgrade script

Signed-off-by: Mike Rylander <mrylander@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 739754f143..3eba0105c3 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/0678.data.vandelay-default-merge-profiles.sql b/Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql
new file mode 100644
index 0000000000..81ca4b9fa5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0678.data.vandelay-default-merge-profiles.sql
@@ -0,0 +1,14 @@
+-- Evergreen DB patch 0678.data.vandelay-default-merge-profiles.sql
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0678', :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;
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
deleted file mode 100644
index df3d014340..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-merge-profiles.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- 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;