Changeset: 03550d3d4234 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03550d3d4234
Modified Files:
        monetdb5/extras/jaql/jaqlgencode.c
Branch: Feb2013
Log Message:

funccall: allow json argument to be passed as well

Make functions that take and return json structs be callable.


diffs (20 lines):

diff --git a/monetdb5/extras/jaql/jaqlgencode.c 
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -7388,6 +7388,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr 
                                                switch (coltypes[i]) {
                                                        case j_json:
                                                        case j_json_arr:
+                                                       case j_sort_arg:
                                                        case j_var:
                                                                q = 
pushArgument(mb, q, dynaarg[i][0]);
                                                                q = 
pushArgument(mb, q, dynaarg[i][1]);
@@ -7397,8 +7398,6 @@ dumptree(jc *j, Client cntxt, MalBlkPtr 
                                                                q = 
pushArgument(mb, q, dynaarg[i][5]);
                                                                q = 
pushArgument(mb, q, dynaarg[i][6]);
                                                                break;
-                                                       case j_sort_arg:
-                                                               assert(0);
                                                        default:
                                                                q = 
pushArgument(mb, q, dynaarg[i][0]);
                                                                break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to