From bbf645e0f936ca4b0b5b29b070abfbdee29bb5dc Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Wed, 11 Jul 2012 10:54:44 -0400 Subject: [PATCH] Avoid problem with 2.1 -> 2.2 upgrade script issuing error The error is: > ERROR: cannot ALTER TABLE "thesaurus" because it has pending > trigger events. Reported by Justin Hopkins, George Duimovich, and Bill Erickson. Signed-off-by: Lebbeous Fogle-Weekley Signed-off-by: Justin Hopkins --- Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 6ec712d2a9..f527d2937f 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 @@ -2730,7 +2730,7 @@ CREATE TABLE authority.control_set_bib_field ( CREATE TABLE authority.thesaurus ( code TEXT PRIMARY KEY, -- MARC21 thesaurus code - control_set INT NOT NULL REFERENCES authority.control_set (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, + control_set INT REFERENCES authority.control_set (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, name TEXT NOT NULL UNIQUE, -- i18n description TEXT -- i18n ); @@ -12430,7 +12430,9 @@ SELECT SETVAL('config.coded_value_map_id_seq'::TEXT, (SELECT max(id) FROM config SELECT evergreen.upgrade_deps_block_check('0717', :eg_version); -- Allow un-mapped thesauri -ALTER TABLE authority.thesaurus ALTER COLUMN control_set DROP NOT NULL; +-- ALTER TABLE authority.thesaurus ALTER COLUMN control_set DROP NOT NULL; +-- XXX The above line is now covered by changes to the +-- "CREATE TABLE authority.thesaurus" statement further up. -- Don't tie "No attempt to code" to LoC UPDATE authority.thesaurus SET control_set = NULL WHERE code = '|'; -- 2.43.2