[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 712bf8ffdc41376c6178f683bc1fabf0888fdf31

[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, rel_2_3 has been updated
       via  712bf8ffdc41376c6178f683bc1fabf0888fdf31 (commit)
       via  13119470e51759229ecb26a53955bee77841f018 (commit)
       via  7df02665b81e577006d6309df0fb60fb140f4a55 (commit)
      from  97e134a859c2c0cc876f1501a06d9b5ef74fa12d (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 712bf8ffdc41376c6178f683bc1fabf0888fdf31
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 b2de987..bcc0878 100644
--- 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 ('0788', :eg_version); -- bshum/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 13119470e51759229ecb26a53955bee77841f018
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 7df02665b81e577006d6309df0fb60fb140f4a55
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 23df6d3..2a591a4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -3022,7 +3022,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