From 03918419b627f3ce662b94df8add9da28db1ddb8 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Thu, 10 May 2012 11:05:54 -0400 Subject: [PATCH] Version Upgrade Cleanup Merge tacked on transactions into the "primary" transaction. Add in 0708 for tracking purposes. Signed-off-by: Thomas Berezansky --- .../sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql | 114 +++++++++------------ 1 file changed, 50 insertions(+), 64 deletions(-) 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 3086b50cd1..0dfbf4da08 100644 --- 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 @@ -15644,61 +15644,10 @@ DROP TYPE actor.org_unit_custom_tree_purpose; COMMIT; */ -COMMIT; - --- This is split out because it was backported to 2.1, but may not exist before upgrades --- It can safely fail --- Also, lets say that. <_< -\qecho -\qecho ************************************************************************* -\qecho !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -\qecho We are about to apply a patch that may not be needed. It can fail safely. -\qecho !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -\qecho ************************************************************************* -\qecho - --- Evergreen DB patch 0693.schema.do_not_despace_issns.sql --- --- FIXME: insert description of change, if needed --- -BEGIN; - - --- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('0693', :eg_version); - --- FIXME: add/check SQL statements to perform the upgrade --- Delete the index normalizer that was meant to remove spaces from ISSNs --- but ended up breaking records with multiple ISSNs -DELETE FROM config.metabib_field_index_norm_map WHERE id IN ( - SELECT map.id FROM config.metabib_field_index_norm_map map - INNER JOIN config.metabib_field cmf ON cmf.id = map.field - INNER JOIN config.index_normalizer cin ON cin.id = map.norm - WHERE cin.func = 'replace' - AND cmf.field_class = 'identifier' - AND cmf.name = 'issn' - AND map.params = $$[" ",""]$$ -); - --- Reindex records that have more than just a single ISSN --- to ensure that spaces are maintained -SELECT metabib.reingest_metabib_field_entries(source) - FROM metabib.identifier_field_entry mife - INNER JOIN config.metabib_field cmf ON cmf.id = mife.field - WHERE cmf.field_class = 'identifier' - AND cmf.name = 'issn' - AND char_length(value) > 9 -; - - -COMMIT; - -- Evergreen DB patch 0704.schema.query_parser_fts.sql -- -- Add pref_ou query filter for preferred library searching -- -BEGIN; - -- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('0704', :eg_version); @@ -16033,12 +15982,8 @@ DROP FUNCTION IF EXISTS search.query_parser_fts ( INT, INT, TEXT, INT[], INT[], INT, INT, INT, BOOL, BOOL ); -COMMIT; - -- Evergreen DB patch 0705.data.custom-org-tree-perms.sql -- -BEGIN; - -- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('0705', :eg_version); @@ -16054,11 +15999,7 @@ INSERT INTO permission.perm_list (id, code, description) ) ); -COMMIT; - - -- Evergreen DB patch 0707.schema.acq-vandelay-integration.sql -BEGIN; SELECT evergreen.upgrade_deps_block_check('0707', :eg_version); @@ -16085,13 +16026,11 @@ INSERT INTO permission.perm_list ( id, code, description ) ) ); -COMMIT; +-- This upgrade script fixed a typo in a previous one. It was corrected in the proper place in this file. +-- Still, record the fact it has been "applied". +SELECT evergreen.upgrade_deps_block_check('0708', :eg_version); -- Evergreen DB patch 0709.data.misc_missing_perms.sql --- --- Fixes a typo in the name of a global flag - -BEGIN; SELECT evergreen.upgrade_deps_block_check('0709', :eg_version); @@ -16135,3 +16074,50 @@ INSERT INTO permission.perm_list ( id, code, description ) ); COMMIT; + +-- This is split out because it was backported to 2.1, but may not exist before upgrades +-- It can safely fail +-- Also, lets say that. <_< +\qecho +\qecho ************************************************************************* +\qecho !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +\qecho We are about to apply a patch that may not be needed. It can fail safely. +\qecho !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +\qecho ************************************************************************* +\qecho + +-- Evergreen DB patch 0693.schema.do_not_despace_issns.sql +-- +-- FIXME: insert description of change, if needed +-- +BEGIN; + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0693', :eg_version); + +-- FIXME: add/check SQL statements to perform the upgrade +-- Delete the index normalizer that was meant to remove spaces from ISSNs +-- but ended up breaking records with multiple ISSNs +DELETE FROM config.metabib_field_index_norm_map WHERE id IN ( + SELECT map.id FROM config.metabib_field_index_norm_map map + INNER JOIN config.metabib_field cmf ON cmf.id = map.field + INNER JOIN config.index_normalizer cin ON cin.id = map.norm + WHERE cin.func = 'replace' + AND cmf.field_class = 'identifier' + AND cmf.name = 'issn' + AND map.params = $$[" ",""]$$ +); + +-- Reindex records that have more than just a single ISSN +-- to ensure that spaces are maintained +SELECT metabib.reingest_metabib_field_entries(source) + FROM metabib.identifier_field_entry mife + INNER JOIN config.metabib_field cmf ON cmf.id = mife.field + WHERE cmf.field_class = 'identifier' + AND cmf.name = 'issn' + AND char_length(value) > 9 +; + + +COMMIT; -- 2.11.0