From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 7 Jan 2019 15:49:28 +0000 (-0500)
Subject: LP1810802 org_top() SQL upgrade repairs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=eaca9cd603da425a82ad478c7798645ea45c2178;p=evergreen%2Fpines.git

LP1810802 org_top() SQL upgrade repairs

1. Drop the org_top function before recreating it since the return type
changes.

2. Fis syntax error in "COMMIT:"

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jason Stephenson <jason@sigio.com>
---

diff --git a/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql b/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
index c7ff6476c0..105136c056 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1140.function.non-set-returning-evergreen.org_top.sql
@@ -2,9 +2,11 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('1140', :eg_version);
 
+DROP FUNCTION IF EXISTS evergreen.org_top();
+
 CREATE OR REPLACE FUNCTION evergreen.org_top()
 RETURNS actor.org_unit AS $$
     SELECT * FROM actor.org_unit WHERE parent_ou IS NULL LIMIT 1;
 $$ LANGUAGE SQL STABLE;
 
-COMMIT:
+COMMIT;