From: Thomas Berezansky <tsbere@mvlc.org>
Date: Mon, 11 Jul 2011 17:24:26 +0000 (-0400)
Subject: Upgrade dep functions were broken
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=757f7ce80a6a50c4f959063889c62f0a751a780f;p=working%2FEvergreen.git

Upgrade dep functions were broken

No clue how to handle upgrade scripts. :(

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 294eb0e055..1421591e83 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -864,6 +864,7 @@ CREATE OR REPLACE FUNCTION evergreen.upgrade_verify_no_dep_conflicts ( my_db_pat
              SELECT * FROM evergreen.upgrade_list_applied_deprecated( $1 )
                 UNION
              SELECT * FROM evergreen.upgrade_list_applied_superseded( $1 ))x
+      WHERE x IS NOT NULL
 $$ LANGUAGE SQL;
 
 -- Raise an exception if there are, in fact, dep/sup conflict
@@ -882,8 +883,8 @@ Upgrade script % can not be applied:
   deprecated by %
   superseded by %',
             my_db_patch,
-            ARRAY_AGG(evergreen.upgrade_list_applied_deprecates(my_db_patch)),
-            ARRAY_AGG(evergreen.upgrade_list_applied_supersedes(my_db_patch)),
+            deprecates,
+            supersedes,
             evergreen.upgrade_list_applied_deprecated(my_db_patch),
             evergreen.upgrade_list_applied_superseded(my_db_patch);
     END IF;