[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3151bb5c5dc8e6512a9e8619f09a2bf5fc047717

[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  3151bb5c5dc8e6512a9e8619f09a2bf5fc047717 (commit)
      from  ba6ffe0fe4140cc6761f2a9fff65e38649b8925c (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 3151bb5c5dc8e6512a9e8619f09a2bf5fc047717
Author: Dan Scott <dan at coffeecode.net>
Date:   Sat Jun 11 07:23:45 2011 -0400

    Correct base schema for superseded/deprecated functions
    
    As discussed on Evergreen dev list, the base schema didn't
    match what one would accomplish via upgrades for the
    evergreen.upgrade_list_applied_deprecated() and
    evergreen.upgrade_list_applied_superseded() functions;
    they were returning TEXT instead of SETOF TEXT.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 9b5bffb..4252778 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -840,17 +840,17 @@ CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_supersedes ( my_db_pat
 $$ LANGUAGE SQL;
 
 -- List applied db patches that deprecates (and block the application of) my_db_patch
-CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_deprecated ( my_db_patch TEXT ) RETURNS TEXT AS $$
+CREATE FUNCTION evergreen.upgrade_list_applied_deprecated ( my_db_patch TEXT ) RETURNS SETOF TEXT AS $$
     SELECT  db_patch
       FROM  config.db_patch_dependencies
-      WHERE ARRAY[$1]::TEXT[] && deprecates 
+      WHERE ARRAY[$1]::TEXT[] && deprecates
 $$ LANGUAGE SQL;
 
 -- List applied db patches that supersedes (and block the application of) my_db_patch
-CREATE OR REPLACE FUNCTION evergreen.upgrade_list_applied_superseded ( my_db_patch TEXT ) RETURNS TEXT AS $$
+CREATE FUNCTION evergreen.upgrade_list_applied_superseded ( my_db_patch TEXT ) RETURNS SETOF TEXT AS $$
     SELECT  db_patch
       FROM  config.db_patch_dependencies
-      WHERE ARRAY[$1]::TEXT[] && supersedes 
+      WHERE ARRAY[$1]::TEXT[] && supersedes
 $$ LANGUAGE SQL;
 
 -- Make sure that no deprecated or superseded db patches are currently applied

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS