Changeset: adf78bca2a92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adf78bca2a92
Modified Files:
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Don't use atomToStr for JSON because we don't need to escape quotes in the new
protocol.
diffs (20 lines):
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -19,6 +19,7 @@
#include <bat/bat_storage.h>
#include <rel_exp.h>
#include <conversion.h>
+#include <json.h>
#ifndef HAVE_LLABS
#define llabs(x) ((x) < 0 ? -(x) : (x))
@@ -1903,7 +1904,7 @@ int mvc_export_resultset_prot10(mvc *m,
int typelen = ATOMsize(mtype);
int nil_len = -1;
int retval = -1;
- int convert_to_string =
!type_supports_binary_transfer(c->type.type);
+ int convert_to_string =
!type_supports_binary_transfer(c->type.type) && b->ttype != TYPE_json;
sql_type *type = c->type.type;
lng print_width = 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
