We need to actually decode the json...

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 82ddcf9..411693d 100644 (file)
--- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql
+++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
@@ -299,7 +299,7 @@ CREATE VIEW metabib.full_attr_id_map AS
 CREATE OR REPLACE FUNCTION metabib.compile_composite_attr ( cattr_def TEXT ) RETURNS query_int AS $func$
 
     use JSON::XS;
-    my $def = shift;
+    my $def = decode_json(shift);
 
     die("Composite attribute definition not supplied") unless $def;
 

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 e98c8ea..488c362 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/ZZZZ.function.composite_compiler.sql
@@ -3,7 +3,7 @@ BEGIN;
 CREATE OR REPLACE FUNCTION metabib.compile_composite_attr ( cattr_def TEXT ) RETURNS query_int AS $func$
 
     use JSON::XS;
-    my $def = shift;
+    my $def = decode_json(shift);
 
     die("Composite attribute definition not supplied") unless $def;