Stamping Upgrade Script for Suppress Transits

In addition to stamping, this commit also makes a few trivial
wording changes.

Signed-off-by: Dan Wells <dbw2@calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 7fa9257..2cbd5ef 100644 (file)
--- 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 ('0629', :eg_version); -- senator/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0630', :eg_version); -- tsbere/dbwells
 
 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 69e71b4..2dfc497 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -3321,7 +3321,7 @@ INSERT into config.org_unit_setting_type
         'Suppress Hold Transits Group',
         'coust', 'label'),
     oils_i18n_gettext('circ.transit.suppress_hold',
-        'If set to a non-empty string Hold Transits will be suppressed between this OU and others with the same value. If set to an empty string transits will not be suppressed.',
+        'If set to a non-empty value, Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
         'coust', 'description'),
     'string', null)
 
@@ -3330,7 +3330,7 @@ INSERT into config.org_unit_setting_type
         'Suppress Non-Hold Transits Group',
         'coust', 'label'),
     oils_i18n_gettext('circ.transit.suppress_non_hold',
-        'If set to a non-empty string Non-Hold Transits will be suppressed between this OU and others with the same value. If set to an empty string transits will not be suppressed.',
+        'If set to a non-empty value, Non-Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
         'coust', 'description'),
     'string', null)
 

diff --git a/Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql b/Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql
new file mode 100644 (file)
index 0000000..d9d4c15
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql
@@ -0,0 +1,23 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0630', :eg_version);
+
+INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) VALUES
+( 'circ.transit.suppress_hold', 'circ',
+    oils_i18n_gettext('circ.transit.suppress_hold',
+        'Suppress Hold Transits Group',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.transit.suppress_hold',
+        'If set to a non-empty value, Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
+        'coust', 'description'),
+    'string')
+,( 'circ.transit.suppress_non_hold', 'circ',
+    oils_i18n_gettext('circ.transit.suppress_non_hold',
+        'Suppress Non-Hold Transits Group',
+        'coust', 'label'),
+    oils_i18n_gettext('circ.transit.suppress_non_hold',
+        'If set to a non-empty value, Non-Hold Transits will be suppressed between this OU and others with the same value. If set to an empty value, transits will not be suppressed.',
+        'coust', 'description'),
+    'string');
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.suppress_transits.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.suppress_transits.sql
deleted file mode 100644 (file)
index 8f551c3..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.suppress_transits.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) VALUES
-( 'circ.transit.suppress_hold', 'circ',
-    oils_i18n_gettext('circ.transit.suppress_hold',
-        'Suppress Hold Transits Group',
-        'coust', 'label'),
-    oils_i18n_gettext('circ.transit.suppress_hold',
-        'If set to a non-empty string Hold Transits will be suppressed between this OU and others with the same value. If set to an empty string transits will not be suppressed.',
-        'coust', 'description'),
-    'string')
-,( 'circ.transit.suppress_non_hold', 'circ',
-    oils_i18n_gettext('circ.transit.suppress_non_hold',
-        'Suppress Non-Hold Transits Group',
-        'coust', 'label'),
-    oils_i18n_gettext('circ.transit.suppress_non_hold',
-        'If set to a non-empty string Non-Hold Transits will be suppressed between this OU and others with the same value. If set to an empty string transits will not be suppressed.',
-        'coust', 'description'),
-    'string');