From ec7d57f880c5bc7f67f156d31dcec78d5c50e21c Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 4 Nov 2022 13:37:23 -0400 Subject: [PATCH] fixes to the 3.9.1-3.10-beta schema - apply the fix to the 1344 upddate - fix syntax error in the reingest from 1344 - ensure that the reingest occurs only once and outside of the main transaction Signed-off-by: Galen Charlton --- ...44.function.trim_trailing_punct-improvement.sql | 2 +- .../version-upgrade/3.9.1-3.10-beta-upgrade-db.sql | 24 ++-------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/1344.function.trim_trailing_punct-improvement.sql b/Open-ILS/src/sql/Pg/upgrade/1344.function.trim_trailing_punct-improvement.sql index 4ebf5ed197..cc59b0816e 100644 --- a/Open-ILS/src/sql/Pg/upgrade/1344.function.trim_trailing_punct-improvement.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1344.function.trim_trailing_punct-improvement.sql @@ -64,6 +64,6 @@ COMMIT; SELECT metabib.reingest_metabib_field_entries( id, TRUE, FALSE, FALSE, TRUE, - (SELECT ARRAY_AGG(id) INTO field_list FROM config.metabib_field WHERE field_class='title' AND (browse_field OR facet_field OR display_field)) + (SELECT ARRAY_AGG(id) FROM config.metabib_field WHERE field_class='title' AND (browse_field OR facet_field OR display_field)) ) FROM biblio.record_entry; diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.9.1-3.10-beta-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.9.1-3.10-beta-upgrade-db.sql index 056142eda5..38b4073c00 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/3.9.1-3.10-beta-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.9.1-3.10-beta-upgrade-db.sql @@ -743,13 +743,6 @@ END; $$ language 'plpgsql'; -INSERT INTO config.index_normalizer (name, description, func, param_count) VALUES ( - 'Trim Trailing Punctuation', - 'Eliminate extraneous trailing ISBD punctuation in text: slashes, colons, commas, and periods', - 'metabib.trim_trailing_punctuation', - 0 -); - INSERT INTO config.metabib_field_index_norm_map (field,norm,pos) SELECT m.id, i.id, @@ -760,17 +753,6 @@ INSERT INTO config.metabib_field_index_norm_map (field,norm,pos) AND m.field_class='title' AND (m.browse_field OR m.facet_field OR m.display_field) AND NOT EXISTS (SELECT 1 FROM config.metabib_field_index_norm_map WHERE field = m.id AND norm = i.id); - -\qecho A partial reingest is necessary to get the full benefit of this change. -\qecho The reingest will commence at the end of the version upgrade script. -\qecho - -SELECT metabib.reingest_metabib_field_entries( - id, TRUE, FALSE, FALSE, TRUE, - (SELECT ARRAY_AGG(id) INTO field_list FROM config.metabib_field WHERE field_class='title' AND (browse_field OR facet_field OR display_field)) -) FROM biblio.record_entry; - - SELECT evergreen.upgrade_deps_block_check('1345', :eg_version); CREATE TABLE acq.shipment_notification ( @@ -2210,6 +2192,7 @@ VALUES ( ) ); +COMMIT; \qecho A partial reingest is necessary to get the full benefit of the change in \qecho upgrade script 1344 (bug 1864507) It will take a while. @@ -2219,12 +2202,9 @@ VALUES ( SELECT metabib.reingest_metabib_field_entries( id, TRUE, FALSE, FALSE, TRUE, - (SELECT ARRAY_AGG(id) INTO field_list FROM config.metabib_field WHERE field_class='title' AND (browse_field OR facet_field OR display_field)) + (SELECT ARRAY_AGG(id) FROM config.metabib_field WHERE field_class='title' AND (browse_field OR facet_field OR display_field)) ) FROM biblio.record_entry; - -COMMIT; - -- Update auditor tables to catch changes to source tables. -- Can be removed/skipped if there were no schema changes. SELECT auditor.update_auditors(); -- 2.11.0