From 1ee95bc56c8b22055426391bbff6af530cf1504f Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Tue, 25 Nov 2014 13:49:00 -0500 Subject: [PATCH] Apply fix for "Could not find trigger" (LP 1261355) Signed-off-by: Dan Scott --- Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql | 34 ++++------------------ 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql b/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql index ad8465ce26..0a22a1bbd8 100644 --- a/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql +++ b/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql @@ -12480,16 +12480,17 @@ UPDATE config.usr_setting_type SET -- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('0841', :eg_version); +SELECT evergreen.upgrade_deps_block_check('0842', :eg_version); +SELECT evergreen.upgrade_deps_block_check('0843', :eg_version); ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey; ALTER TABLE config.metabib_search_alias DROP CONSTRAINT metabib_search_alias_field_fkey; -ALTER TABLE config.z3950_index_field_map DROP CONSTRAINT z3950_index_field_map_metabib_field_fkey; ALTER TABLE metabib.browse_entry_def_map DROP CONSTRAINT browse_entry_def_map_def_fkey; -ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED; -ALTER TABLE config.metabib_search_alias ADD CONSTRAINT metabib_search_alias_field_fkey FOREIGN KEY (field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED; -ALTER TABLE config.z3950_index_field_map ADD CONSTRAINT z3950_index_field_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED; -ALTER TABLE metabib.browse_entry_def_map ADD CONSTRAINT browse_entry_def_map_def_fkey FOREIGN KEY (def) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE config.metabib_search_alias ADD CONSTRAINT metabib_search_alias_field_fkey FOREIGN KEY (field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE metabib.browse_entry_def_map ADD CONSTRAINT browse_entry_def_map_def_fkey FOREIGN KEY (def) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; + DROP FUNCTION IF EXISTS config.modify_metabib_field(source INT, target INT); @@ -12532,29 +12533,6 @@ SELECT config.modify_metabib_field(id, NULL) SELECT SETVAL('config.metabib_field_id_seq', GREATEST(1000, (SELECT MAX(id) FROM config.metabib_field))); -- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('0842', :eg_version); - --- this upgrade is only for people coming from 2_3, and is a NO-OP for those on 2_4 -ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey; - -ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; - --- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('0843', :eg_version); - --- this upgrade file serves 2 purposes: --- 1) add ON UPDATE CASCADE for those upgrading 2_5/master --- 2) alter config.z3950_index_field_map for those upgrading from 2_4 and previous (other lines --- are no-ops in this case) -ALTER TABLE config.metabib_search_alias DROP CONSTRAINT metabib_search_alias_field_fkey; -ALTER TABLE config.z3950_index_field_map DROP CONSTRAINT z3950_index_field_map_metabib_field_fkey; -ALTER TABLE metabib.browse_entry_def_map DROP CONSTRAINT browse_entry_def_map_def_fkey; - -ALTER TABLE config.metabib_search_alias ADD CONSTRAINT metabib_search_alias_field_fkey FOREIGN KEY (field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; -ALTER TABLE config.z3950_index_field_map ADD CONSTRAINT z3950_index_field_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; -ALTER TABLE metabib.browse_entry_def_map ADD CONSTRAINT browse_entry_def_map_def_fkey FOREIGN KEY (def) REFERENCES config.metabib_field(id) ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED; - --- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('0844', :eg_version); -- 953.data.MODS32-xsl.sql -- 2.11.0