From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 26 Apr 2015 16:29:18 +0000 (-0400)
Subject: LP#1438136: Make upgrade script forgiving
X-Git-Tag: sprint4-merge-nov22~1075
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=305aae5b36966e0d9a3ff0cf85b6a05df63bd349;p=working%2FEvergreen.git

LP#1438136: Make upgrade script forgiving

If the functions already exist, that's OK.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jason Boyer <jboyer@library.in.gov>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
index f405c1ae50..9fa639fe16 100644
--- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
+++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
@@ -46,7 +46,7 @@ BEGIN
 END;
 $$ LANGUAGE PLPGSQL;
 
-CREATE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$
+CREATE OR REPLACE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$
 BEGIN
     RETURN $1 @@ $2::query_int;
 END;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vlist_freq.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vlist_freq.sql
index 2b8e8429a0..a7b992be16 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vlist_freq.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vlist_freq.sql
@@ -27,7 +27,7 @@ BEGIN
 END;
 $$ LANGUAGE PLPGSQL;
 
-CREATE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$
+CREATE OR REPLACE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$
 BEGIN
     RETURN $1 @@ $2::query_int;
 END;