Database upgrade script fixes

Fixing up a couple of upgrade scripts that I merged this week.

Signed-off-by: Kathy Lussier <klussier@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 (file)
--- 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 (file)
--- 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