Fix version references and run updates to authority.thesaurus in a separate transaction

Way earlier in the upgrade script a transaction is started and changes get made to the authority
schema. This breaks things later on when those same tables are touched in the same transaction.

Signed-off-by: Justin Hopkins <hopkinsju@gmail.com>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index a16a0cc..89078ba 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -1,4 +1,4 @@
---Upgrade Script for 2.1 to 2.2-alpha2
+--Upgrade Script for 2.1 to 2.2
 
 -- Don't require use of -vegversion=something
 \set eg_version '''2.2'''
@@ -11,7 +11,7 @@ DROP FUNCTION IF EXISTS evergreen.upgrade_list_applied_deprecates(TEXT);
 DROP FUNCTION IF EXISTS evergreen.upgrade_list_applied_supersedes(TEXT);
 
 BEGIN;
-INSERT INTO config.upgrade_log (version) VALUES ('2.2-beta2');
+INSERT INTO config.upgrade_log (version) VALUES ('2.2');
 
 INSERT INTO config.upgrade_log (version) VALUES ('0526'); --miker
 
@@ -12424,11 +12424,14 @@ SELECT evergreen.upgrade_deps_block_check('0716', :eg_version);
 
 SELECT SETVAL('config.coded_value_map_id_seq'::TEXT, (SELECT max(id) FROM config.coded_value_map));
 
+COMMIT;
 
 -- Evergreen DB patch 0717.data.safer-control-set-defaults.sql
 
 SELECT evergreen.upgrade_deps_block_check('0717', :eg_version);
 
+BEGIN;
+
 -- Allow un-mapped thesauri
 ALTER TABLE authority.thesaurus ALTER COLUMN control_set DROP NOT NULL;