[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_2_alpha2 updated. 182840c9f748237662676b0bf3d69bb0d1e36824

[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, tags/rel_2_2_alpha2 has been updated
       via  182840c9f748237662676b0bf3d69bb0d1e36824 (commit)
      from  97d5b6843a03d7a94f3090cce5b67d15eea4d939 (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 182840c9f748237662676b0bf3d69bb0d1e36824
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Thu Mar 1 12:33:01 2012 -0500

    More upgrade script fixes
    
    This time public.is_json compared to evergreen.is_json. :(
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index 5de0d98..ded1aac 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -5888,6 +5888,14 @@ $$ LANGUAGE SQL ROWS 10;
 -- check whether patch can be applied
 SELECT evergreen.upgrade_deps_block_check('0641', :eg_version);
 
+-- This may not be in the evergreen schema on upgrades. So put it there.
+CREATE OR REPLACE FUNCTION evergreen.is_json( TEXT ) RETURNS BOOL AS $f$
+    use JSON::XS;
+    my $json = shift();
+    eval { JSON::XS->new->allow_nonref->decode( $json ) };
+    return $@ ? 0 : 1;
+$f$ LANGUAGE PLPERLU;
+
 ALTER TABLE actor.org_unit_setting ADD CONSTRAINT aous_must_be_json CHECK ( evergreen.is_json(value) );
 
 -- Evergreen DB patch 0642.data.acq-worksheet-hold-count.sql

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

Summary of changes:
 .../sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql  |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS