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

[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  c260a675d60119edb9d23d0dd86213e81d681df9 (commit)
       via  21bcf415df7efb7d3336283fe5045c174c3b1a4a (commit)
       via  f81eff8f86e733a7ebe527ed961bf2ca51caa05e (commit)
      from  a1344fa35bd6690e8b9495e54dfa4b1e157cab12 (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 c260a675d60119edb9d23d0dd86213e81d681df9
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Jul 10 10:53:41 2013 -0400

    Stamping upgrade script for empty seed description
    
    Signed-off-by: Dan Wells <dbw2 at 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 89e5232..30d2ddf 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('0802', :eg_version); -- miker/ysuarez/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0803', :eg_version); -- paxed/remingtron/dbwells
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql b/Open-ILS/src/sql/Pg/upgrade/0803.data.fill_empty_description.sql
similarity index 79%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql
rename to Open-ILS/src/sql/Pg/upgrade/0803.data.fill_empty_description.sql
index ce297b5..590e717 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0803.data.fill_empty_description.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0803', :eg_version);
 
 UPDATE config.org_unit_setting_type 
 SET description = 'The amount of time an item will be held on the shelf before the hold expires. For example: "2 weeks" or "5 days"' 

commit 21bcf415df7efb7d3336283fe5045c174c3b1a4a
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Wed Jul 10 09:32:07 2013 -0400

    LP1158211 - add upgrade script to fill empty description
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql
new file mode 100644
index 0000000..ce297b5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fill_empty_description.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.org_unit_setting_type 
+SET description = 'The amount of time an item will be held on the shelf before the hold expires. For example: "2 weeks" or "5 days"' 
+WHERE name = 'circ.holds.default_shelf_expire_interval';
+
+COMMIT;

commit f81eff8f86e733a7ebe527ed961bf2ca51caa05e
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue Jun 11 11:01:53 2013 +0300

    Description for circ.holds.default_shelf_expire_interval
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

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 f575681..e12086f 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -3052,7 +3052,7 @@ INSERT into config.org_unit_setting_type
         'Default hold shelf expire interval',
         'coust', 'label'),
     oils_i18n_gettext('circ.holds.default_shelf_expire_interval',
-        '',
+        'The amount of time an item will be held on the shelf before the hold expires. For example: "2 weeks" or "5 days"',
         'coust', 'description'),
     'interval', null)
 

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    2 +-
 .../upgrade/0803.data.fill_empty_description.sql   |    9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0803.data.fill_empty_description.sql


hooks/post-receive
-- 
Evergreen ILS