From 82a656943c6ac116e74847149c03b363c5744962 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Wed, 14 May 2014 17:49:51 -0400 Subject: [PATCH] Preserve script version from 2.6.0 The forward-port had some fixes, so revert those (to be reapplied in the next commit) to better show fix history for 2.6.1. Signed-off-by: Dan Wells --- .../Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql | 35 +++++++++------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql index 05f6d67ef8..482bc85841 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.5.3-2.6.0-upgrade-db.sql @@ -1,19 +1,5 @@ --Upgrade Script for 2.5.3 to 2.6.0 \set eg_version '''2.6.0''' - -\qecho -\qecho **** NOTICE **** -\qecho 'We are disabling all triggers for authority.record_entry outside the ' -\qecho 'transaction. If this upgrade fails, you may want to double-check that ' -\qecho 'triggers are reactivated, e.g.:' -\qecho 'ALTER TABLE authority.record_entry ENABLE TRIGGER ALL;' -\qecho -ALTER TABLE authority.record_entry DISABLE TRIGGER a_marcxml_is_well_formed; -ALTER TABLE authority.record_entry DISABLE TRIGGER aaa_auth_ingest_or_delete; -ALTER TABLE authority.record_entry DISABLE TRIGGER b_maintain_901; -ALTER TABLE authority.record_entry DISABLE TRIGGER c_maintain_control_numbers; -ALTER TABLE authority.record_entry DISABLE TRIGGER map_thesaurus_to_control_set; - BEGIN; INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.6.0', :eg_version); @@ -5571,6 +5557,13 @@ END; $func$ LANGUAGE PLPGSQL; +ALTER TABLE authority.record_entry DISABLE TRIGGER a_marcxml_is_well_formed; +ALTER TABLE authority.record_entry DISABLE TRIGGER aaa_auth_ingest_or_delete; +ALTER TABLE authority.record_entry DISABLE TRIGGER b_maintain_901; +ALTER TABLE authority.record_entry DISABLE TRIGGER c_maintain_control_numbers; +ALTER TABLE authority.record_entry DISABLE TRIGGER map_thesaurus_to_control_set; + + SELECT evergreen.upgrade_deps_block_check('0875', :eg_version); ALTER TABLE authority.record_entry ADD COLUMN heading TEXT, ADD COLUMN simple_heading TEXT; @@ -5604,6 +5597,13 @@ ALTER FUNCTION authority.simple_normalize_heading(TEXT) STABLE STRICT; ALTER FUNCTION authority.simple_heading_set(TEXT) STABLE STRICT; +ALTER TABLE authority.record_entry ENABLE TRIGGER a_marcxml_is_well_formed; +ALTER TABLE authority.record_entry ENABLE TRIGGER aaa_auth_ingest_or_delete; +ALTER TABLE authority.record_entry ENABLE TRIGGER b_maintain_901; +ALTER TABLE authority.record_entry ENABLE TRIGGER c_maintain_control_numbers; +ALTER TABLE authority.record_entry ENABLE TRIGGER map_thesaurus_to_control_set; + + SELECT evergreen.upgrade_deps_block_check('0876', :eg_version); @@ -5817,13 +5817,6 @@ $$ LANGUAGE PLPGSQL; COMMIT; --- re-enable the triggers we disabled before starting the transaction -ALTER TABLE authority.record_entry ENABLE TRIGGER a_marcxml_is_well_formed; -ALTER TABLE authority.record_entry ENABLE TRIGGER aaa_auth_ingest_or_delete; -ALTER TABLE authority.record_entry ENABLE TRIGGER b_maintain_901; -ALTER TABLE authority.record_entry ENABLE TRIGGER c_maintain_control_numbers; -ALTER TABLE authority.record_entry ENABLE TRIGGER map_thesaurus_to_control_set; - -- Not running changes from example.reporter-extension.sql since these are -- not installed by default, but including a helpful note. \qecho -- 2.11.0