From: Galen Charlton Date: Wed, 1 May 2013 20:33:39 +0000 (-0400) Subject: LP#1175287: make sure tsearch2 is removed, regardless of its origin X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fff3cd2e830a9d158de2781fe5149003466dcb2c;p=working%2FEvergreen.git LP#1175287: make sure tsearch2 is removed, regardless of its origin A sufficiently old Evergreen database might still have tsearch2 exist as an unpackaged contrib, so convert it to an extension first. Signed-off-by: Galen Charlton --- 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..b7daf052d3 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 @@ -44,6 +44,9 @@ ALTER TABLE metabib.series_field_entry ALTER COLUMN index_vector TYPE pg_catalog ALTER TABLE metabib.subject_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; ALTER TABLE metabib.title_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; +-- Make sure that tsearch2 exists as an extension (for a sufficiently +-- old Evergreen database, it might still be an unpackaged contrib). +CREATE EXTENSION IF NOT EXISTS tsearch2 SCHEMA public FROM unpackaged; -- Halfway there! Goodbye tsearch2 extension! DROP EXTENSION tsearch2; 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..49f28e622b 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 @@ -91,6 +91,9 @@ ALTER TABLE metabib.series_field_entry ALTER COLUMN index_vector TYPE pg_catalog ALTER TABLE metabib.subject_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; ALTER TABLE metabib.title_field_entry ALTER COLUMN index_vector TYPE pg_catalog.tsvector; +-- Make sure that tsearch2 exists as an extension (for a sufficiently +-- old Evergreen database, it might still be an unpackaged contrib). +CREATE EXTENSION IF NOT EXISTS tsearch2 SCHEMA public FROM unpackaged; -- Halfway there! Goodbye tsearch2 extension! DROP EXTENSION tsearch2;