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 <gmc@esilibrary.com>

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 eab7d7d..8179b28 100644 (file)
--- 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 8d957db..d1cd0b5 100644 (file)
--- 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.