Stamping upgrade scripts for Vandelay default match set, with minor adjustments

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 af1a771..10ad215 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0757', :eg_version); -- tsbere/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0758', :eg_version); -- jeff davis / miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

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 95f0f5c..37e0d32 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4725,13 +4725,13 @@ INSERT into config.org_unit_setting_type
 ,( 'vandelay.default_match_set', 'vandelay',
     oils_i18n_gettext(
         'vandelay.default_match_set',
-        'Vandelay: Default Record Match Set',
+        'Default Record Match Set',
         'coust',
         'label'
     ),
     oils_i18n_gettext(
         'vandelay.default_match_set',
-        'Vandelay: Default Record Match Set',
+        'Default Record Match Set',
         'coust',
         'description'
     ),

diff --git a/Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql b/Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
new file mode 100644 (file)
index 0000000..334f90a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
@@ -0,0 +1,11 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0758', :eg_version);
+
+INSERT INTO config.settings_group (name, label) VALUES
+    ('vandelay', 'Vandelay');
+
+INSERT INTO config.org_unit_setting_type (name, grp, label, datatype, fm_class) VALUES
+    ('vandelay.default_match_set', 'vandelay', 'Default Record Match Set', 'link', 'vms');
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
deleted file mode 100644 (file)
index 32db333..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.settings_group (name, label) VALUES
-    ('vandelay', 'Vandelay');
-
-INSERT INTO config.org_unit_setting_type (name, grp, label, datatype, fm_class) VALUES
-    ('vandelay.default_match_set', 'vandelay', 'Vandelay: Default Record Match Set', 'link', 'vms');
-
-COMMIT;