From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 22 May 2018 17:50:44 +0000 (-0400)
Subject: Duplicate oils_json_to_xslt() in evergreen schema
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Frel_3_1_conifer_upgrade;p=contrib%2FConifer.git

Duplicate oils_json_to_xslt() in evergreen schema

I hate duplicating functions, but this lets the upgrade finish,
so that's important.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
index e08f2a4581..700bb0afc4 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
@@ -1091,6 +1091,16 @@ UPDATE actor.org_unit_closed SET full_day = TRUE
         AND SUBSTRING(close_start::time::text FROM 1 FOR 8) = '00:00:00'
         AND SUBSTRING(close_end::time::text FROM 1 FOR 8) = '23:59:59';
 
+-- This is also in the public schema, but needs to be in the evergreen schema now
+CREATE OR REPLACE FUNCTION evergreen.oils_json_to_text( TEXT ) RETURNS TEXT AS $f$
+    use JSON::XS;
+    my $json = shift();
+    my $txt;
+    eval { $txt = JSON::XS->new->allow_nonref->decode( $json ) };
+    return undef if ($@);
+    return $txt
+$f$ LANGUAGE PLPERLU;
+
 CREATE OR REPLACE FUNCTION action.push_circ_due_time () RETURNS TRIGGER AS $$
 DECLARE
     proper_tz TEXT := COALESCE(
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql
index 3589a554e0..2500300e9f 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql
@@ -1,12 +1,12 @@
 \i 2.12.3-2.12.4-upgrade-db.sql
 \i 2.12.4-2.12.5-upgrade-db.sql
 \i 2.12.5-2.12.6-upgrade-db.sql
-\i 2.12.6-3.0.0-upgrade-db.sql
+\i 2.12.6-3.0.0-upgrade-db.sql -- 21 minutes (no ingests)
 \i 3.0.0-3.0.1-upgrade-db.sql
 \i 3.0.1-3.0.2-upgrade-db.sql
-\i 3.0.2-3.0.3-upgrade-db.sql
+\i 3.0.2-3.0.3-upgrade-db.sql -- 3 minutes
 \i 3.0.3-3.0.4-upgrade-db.sql
 \i 3.0.4-3.0.5-upgrade-db.sql
 \i 3.0.5-3.0.6-upgrade-db.sql
-\i 3.0.6-3.1.0-upgrade-db.sql
+\i 3.0.6-3.1.0-upgrade-db.sql -- 2.25 minutes (no ingests)
 \i 3.1.0-3.1.1-upgrade-db.sql