Changeset: 2dba23dcd71c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2dba23dcd71c
Modified Files:
        sql/backends/monet5/Tests/pyapi17.stable.err
        sql/backends/monet5/Tests/pyapi17.stable.out
        sql/backends/monet5/UDF/pyapi/conversion.c
Branch: Jul2017
Log Message:

Only use relevant part of error message.


diffs (58 lines):

diff --git a/sql/backends/monet5/Tests/pyapi17.stable.err 
b/sql/backends/monet5/Tests/pyapi17.stable.err
--- a/sql/backends/monet5/Tests/pyapi17.stable.err
+++ b/sql/backends/monet5/Tests/pyapi17.stable.err
@@ -33,8 +33,8 @@ stderr of test 'pyapi17` in directory 's
 
 MAPI  = (monetdb) /var/tmp/mtest-15243/.s.monetdb.38589
 QUERY = SELECT * FROM pyapi17();
-ERROR = !Error converting dict return value "a": MALException:pyapi.eval:An 
array of size 2 was returned, yet we expect a list of 1 columns. The result is 
invalid..
-MAPI  = (monetdb) /var/tmp/mtest-15243/.s.monetdb.38589
+ERROR = !Error converting dict return value "a": An array of size 2 was 
returned, yet we expect a list of 1 columns. The result is invalid..
+MAPI  = (monetdb) /var/tmp/mtest-18234/.s.monetdb.33641
 QUERY = SELECT * FROM pyapi17();
 ERROR = !Expected a return value with name "c", but this key was not present 
in the dictionary.
 MAPI  = (monetdb) /var/tmp/mtest-15243/.s.monetdb.38589
diff --git a/sql/backends/monet5/Tests/pyapi17.stable.out 
b/sql/backends/monet5/Tests/pyapi17.stable.out
--- a/sql/backends/monet5/Tests/pyapi17.stable.out
+++ b/sql/backends/monet5/Tests/pyapi17.stable.out
@@ -39,7 +39,7 @@ Ready.
 #      return retval
 #};
 #SELECT * FROM pyapi17();
-% .,   .,      .,      . # table_name
+% .L1, .L1,    .L1,    .L1 # table_name
 % a,   b,      c,      d # name
 % clob,        clob,   int,    boolean # type
 % 3,   3,      1,      5 # length
@@ -57,7 +57,7 @@ Ready.
 #      return retval
 #};
 #SELECT * FROM pyapi17();
-% .,   .,      .,      . # table_name
+% .L1, .L1,    .L1,    .L1 # table_name
 % a,   b,      c,      d # name
 % clob,        clob,   int,    boolean # type
 % 3,   3,      1,      5 # length
@@ -97,8 +97,8 @@ Ready.
 #      return retval
 #};
 #SELECT pyapi17(i) FROM integers;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
 % int # type
 % 2 # length
 [ 33   ]
diff --git a/sql/backends/monet5/UDF/pyapi/conversion.c 
b/sql/backends/monet5/UDF/pyapi/conversion.c
--- a/sql/backends/monet5/UDF/pyapi/conversion.c
+++ b/sql/backends/monet5/UDF/pyapi/conversion.c
@@ -493,7 +493,7 @@ PyObject *PyDict_CheckForConversion(PyOb
                        msg = createException(
                                MAL, "pyapi.eval",
                                "Error converting dict return value \"%s\": 
%s.",
-                               retcol_names[i], *return_message);
+                               retcol_names[i], 
getExceptionMessage(*return_message));
                        GDKfree(*return_message);
                        goto wrapup;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to