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

[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  4377948ba4254afcab91cc1640eb92bf06f73392 (commit)
      from  cc481b043893c52951d4cbe9b836bdcf381968e3 (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 4377948ba4254afcab91cc1640eb92bf06f73392
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Feb 10 08:10:15 2017 -0500

    Database upgrade script fixes
    
    Fixing up a couple of upgrade scripts that I merged this week.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/sql/Pg/upgrade/1006.function.trim_trailing_punctuation.sql b/Open-ILS/src/sql/Pg/upgrade/1006.function.trim_trailing_punctuation.sql
index 5a4004a..5d591a4 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1006.function.trim_trailing_punctuation.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1006.function.trim_trailing_punctuation.sql
@@ -1,7 +1,7 @@
-SELECT evergreen.upgrade_deps_block_check('1006', :eg_version);
-
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1006', :eg_version);
+
 -- This function is used to help clean up facet labels. Due to quirks in
 -- MARC parsing, some facet labels may be generated with periods or commas
 -- at the end.  This will strip a trailing commas off all the time, and
diff --git a/Open-ILS/src/sql/Pg/upgrade/1007.data.give-crad-human-descriptions.sql b/Open-ILS/src/sql/Pg/upgrade/1007.data.give-crad-human-descriptions.sql
index 5eb5588..6e5c0a1 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1007.data.give-crad-human-descriptions.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1007.data.give-crad-human-descriptions.sql
@@ -1,7 +1,7 @@
-SELECT evergreen.upgrade_deps_block_check('1007', :eg_version);
-
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1007', :eg_version);
+
 UPDATE config.record_attr_definition
 SET description = oils_i18n_gettext('audience', 'Audience', 'crad', 'label')
 WHERE description IS NULL

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

Summary of changes:
 .../1006.function.trim_trailing_punctuation.sql    |    4 ++--
 .../1007.data.give-crad-human-descriptions.sql     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS