[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. d13e70ed27b9da1475c4e534f4fe30925193b1d6

[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  d13e70ed27b9da1475c4e534f4fe30925193b1d6 (commit)
       via  e9fa80881f6cbe90fc675c3f4eb7169aa2ddb5db (commit)
      from  21b6220b89c5f27452593200f8bea22cb2db33b2 (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 d13e70ed27b9da1475c4e534f4fe30925193b1d6
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Dec 5 16:02:04 2014 -0500

    Update 2.6-2.7.0-upgrade-db.sql to reflect that it actually starts from 2.6.3 and up.
    
    So, actually, the 2.7 upgrade path needs to include everything up to 2.6.3 to get all
    the fixes.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.6.3-2.7.0-upgrade-db.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql
rename to Open-ILS/src/sql/Pg/version-upgrade/2.6.3-2.7.0-upgrade-db.sql
index 2ea0815..43e512d 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.6-2.7.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.6.3-2.7.0-upgrade-db.sql
@@ -1,4 +1,4 @@
---Upgrade Script for 2.6 to 2.7.0
+--Upgrade Script for 2.6.3 to 2.7.0
 \set eg_version '''2.7.0'''
 BEGIN;
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.0', :eg_version);

commit e9fa80881f6cbe90fc675c3f4eb7169aa2ddb5db
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Dec 5 15:59:40 2014 -0500

    Re-order parts of 0887 upgrade script
    
    Based on feedback from dbs, in PostgreSQL 9.1, the order to which we
    fix up these functions matters.  So drop if exists first, then create
    new.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql b/Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql
index 604add1..7763f7e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0887.function.no-ff-defaults.sql
@@ -2,6 +2,8 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('0887', :eg_version);
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field_list( text, text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field_list( marc TEXT, ff TEXT, use_default BOOL DEFAULT FALSE ) RETURNS TEXT[] AS $func$
 DECLARE
     rtype       TEXT;
@@ -34,6 +36,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field( text, text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field( marc TEXT, ff TEXT, use_default BOOL DEFAULT FALSE ) RETURNS TEXT AS $func$
 DECLARE
     rtype       TEXT;
@@ -64,6 +68,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_all_fixed_fields( text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT, use_default BOOL DEFAULT FALSE ) RETURNS SETOF biblio.record_ff_map AS $func$
 DECLARE
     tag_data    TEXT;
@@ -112,9 +118,5 @@ CREATE OR REPLACE FUNCTION biblio.marc21_extract_all_fixed_fields( rid BIGINT )
     SELECT $1 AS record, ff_name, ff_value FROM vandelay.marc21_extract_all_fixed_fields( (SELECT marc FROM biblio.record_entry WHERE id = $1), TRUE );
 $func$ LANGUAGE SQL;
 
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field_list( text, text );
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field( text, text );
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_all_fixed_fields( text );
-
 COMMIT;
 
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql
index 835e022..be6c5f3 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql
@@ -5,6 +5,8 @@ INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.6.3', :eg_versio
 
 SELECT evergreen.upgrade_deps_block_check('0887', :eg_version);
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field_list( text, text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field_list( marc TEXT, ff TEXT, use_default BOOL DEFAULT FALSE ) RETURNS TEXT[] AS $func$
 DECLARE
     rtype       TEXT;
@@ -37,6 +39,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field( text, text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_fixed_field( marc TEXT, ff TEXT, use_default BOOL DEFAULT FALSE ) RETURNS TEXT AS $func$
 DECLARE
     rtype       TEXT;
@@ -67,6 +71,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_all_fixed_fields( text );
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT, use_default BOOL DEFAULT FALSE ) RETURNS SETOF biblio.record_ff_map AS $func$
 DECLARE
     tag_data    TEXT;
@@ -115,11 +121,6 @@ CREATE OR REPLACE FUNCTION biblio.marc21_extract_all_fixed_fields( rid BIGINT )
     SELECT $1 AS record, ff_name, ff_value FROM vandelay.marc21_extract_all_fixed_fields( (SELECT marc FROM biblio.record_entry WHERE id = $1), TRUE );
 $func$ LANGUAGE SQL;
 
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field_list( text, text );
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field( text, text );
-DROP FUNCTION IF EXISTS vandelay.marc21_extract_all_fixed_fields( text );
-
-
 
 SELECT evergreen.upgrade_deps_block_check('0890', :eg_version);
 

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

Summary of changes:
 .../Pg/upgrade/0887.function.no-ff-defaults.sql    |   10 ++++++----
 .../Pg/version-upgrade/2.6.2-2.6.3-upgrade-db.sql  |   11 ++++++-----
 ...0-upgrade-db.sql => 2.6.3-2.7.0-upgrade-db.sql} |    2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)
 rename Open-ILS/src/sql/Pg/version-upgrade/{2.6-2.7.0-upgrade-db.sql => 2.6.3-2.7.0-upgrade-db.sql} (99%)


hooks/post-receive
-- 
Evergreen ILS