From 57391456aeef0ce730c1c6259160499b88c7fdbb Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 1 May 2013 15:29:37 -0400 Subject: [PATCH] LP#1175287: drop tsearch2 only if exists as extension Under certain circumstances, a sufficiently old Evergreen database might have tsearch2 as a contrib, not an extension. Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/upgrade/0743.schema.remove_tsearch2.sql | 2 +- Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/0743.schema.remove_tsearch2.sql b/Open-ILS/src/sql/Pg/upgrade/0743.schema.remove_tsearch2.sql index eab7d7d45d..8179b28dc2 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0743.schema.remove_tsearch2.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0743.schema.remove_tsearch2.sql @@ -45,7 +45,7 @@ ALTER TABLE metabib.subject_field_entry ALTER COLUMN index_vector TYPE pg_catalo ALTER TABLE metabib.title_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; -- Halfway there! Goodbye tsearch2 extension! -DROP EXTENSION tsearch2; +DROP EXTENSION IF EXISTS tsearch2; -- Next up, re-creating all of the stuff we just dropped. diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql index 8d957dbda3..d1cd0b5d41 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql @@ -92,7 +92,7 @@ ALTER TABLE metabib.subject_field_entry ALTER COLUMN index_vector TYPE pg_catalo ALTER TABLE metabib.title_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; -- Halfway there! Goodbye tsearch2 extension! -DROP EXTENSION tsearch2; +DROP EXTENSION IF EXISTS tsearch2; -- Next up, re-creating all of the stuff we just dropped. -- 2.11.0