From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 30 Jan 2014 19:22:32 +0000 (-0500)
Subject: We must return null instead of an empty string, which is not a valid query_int
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=901dd91d2a24a9ee3d48cea87313bec61a45d3cc;p=working%2FEvergreen.git

We must return null instead of an empty string, which is not a valid query_int

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
index 411693d7b4..2caaa832c0 100644
--- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql
+++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
@@ -331,7 +331,7 @@ CREATE OR REPLACE FUNCTION metabib.compile_composite_attr ( cattr_def TEXT ) RET
         return '';
     }
 
-    return recurse($def);
+    return recurse($def) || undef;
 
 $func$ IMMUTABLE LANGUAGE plperlu;
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql
index 488c3625fa..4390ac4843 100644
--- a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql
@@ -35,7 +35,7 @@ CREATE OR REPLACE FUNCTION metabib.compile_composite_attr ( cattr_def TEXT ) RET
         return '';
     }
 
-    return recurse($def);
+    return recurse($def) || undef;
 
 $func$ IMMUTABLE LANGUAGE plperlu;