[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2be86106c04187a6bfeb3a688b1e87d1743f441f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  2be86106c04187a6bfeb3a688b1e87d1743f441f (commit)
      from  9d32147ead32c688e39eb47d0229e19b9972da40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2be86106c04187a6bfeb3a688b1e87d1743f441f
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed May 1 16:33:39 2013 -0400

    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 <gmc at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.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..b7daf05 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.0-upgrade-db.sql
similarity index 99%
copy from Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql
copy to Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0-upgrade-db.sql
index 8d957db..28ce7bd 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.0-upgrade-db.sql
@@ -1,7 +1,7 @@
---Upgrade Script for 2.3 to 2.4.0RC
-\set eg_version '''2.4.0RC'''
+--Upgrade Script for 2.3 to 2.4.0
+\set eg_version '''2.4.0'''
 BEGIN;
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.4.0RC', :eg_version);
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.4.0', :eg_version);
 -- remove the Bypass hold capture during clear shelf process setting
 
 SELECT evergreen.upgrade_deps_block_check('0739', :eg_version);
@@ -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;
 
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..49f28e6 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;
 

-----------------------------------------------------------------------

Summary of changes:
 .../sql/Pg/upgrade/0743.schema.remove_tsearch2.sql |    3 +++
 ...0RC-upgrade-db.sql => 2.3-2.4.0-upgrade-db.sql} |    9 ++++++---
 .../Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql  |    3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)
 copy Open-ILS/src/sql/Pg/version-upgrade/{2.3-2.4.0RC-upgrade-db.sql => 2.3-2.4.0-upgrade-db.sql} (99%)


hooks/post-receive
-- 
Evergreen ILS