Changeset: 39a8a3511b29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39a8a3511b29
Modified Files:
sql/backends/monet5/UDF/pyapi/convert_loops.h
Branch: Jul2017
Log Message:
Also properly convert Python objects to timestamps.
diffs (21 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -530,7 +530,7 @@ convert_and_append(BAT* b, const char* t
if (mask != NULL &&
\
(mask[index_offset * ret->count + iu])
== TRUE) { \
b->tnil = 1;
\
- if (BUNappend(b, str_nil, FALSE) !=
GDK_SUCCEED) { \
+ if (convert_and_append(b, str_nil,
FALSE) != GDK_SUCCEED) { \
msg = createException(MAL,
"pyapi.eval", \
"BUNappend failed.\n"); \
goto wrapup;
\
@@ -541,7 +541,7 @@ convert_and_append(BAT* b, const char* t
((PyObject
**)&data[(index_offset * ret->count + iu) * \
ret->memory_size]), \
utf8_size, &utf8_string);
\
- if (BUNappend(b, utf8_string, FALSE) !=
GDK_SUCCEED) { \
+ if (convert_and_append(b, utf8_string,
FALSE) != GDK_SUCCEED) { \
msg = createException(MAL,
"pyapi.eval", \
"BUNappend failed.\n"); \
goto wrapup;
\
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
