From 6d7ed210b38701d6ce7aa48c866f7d67ad5dcb8e Mon Sep 17 00:00:00 2001
From: Dan Wells <dbw2@calvin.edu>
Date: Mon, 26 Sep 2011 14:23:31 -0400
Subject: [PATCH] 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>
---
 Open-ILS/src/sql/Pg/002.schema.config.sql                      |  2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql                   |  4 ++--
 ...X.suppress_transits.sql => 0630.data.suppress_transits.sql} | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename Open-ILS/src/sql/Pg/upgrade/{XXXX.suppress_transits.sql => 0630.data.suppress_transits.sql} (70%)

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 7fa92574f4..2cbd5ef3aa 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 ('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 69e71b4adf..2dfc497d2e 100644
--- 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/XXXX.suppress_transits.sql b/Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql
similarity index 70%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.suppress_transits.sql
rename to Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql
index 8f551c3ba0..d9d4c15c25 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.suppress_transits.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0630.data.suppress_transits.sql
@@ -1,10 +1,14 @@
+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 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')
 ,( 'circ.transit.suppress_non_hold', 'circ',
@@ -12,6 +16,8 @@ INSERT into config.org_unit_setting_type (name, grp, label, description, datatyp
         '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');
+
+COMMIT;
-- 
2.11.0