Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5452/src/backends/monet5
Modified Files:
sql_gencode.mx sql_result.mx
Log Message:
small fix in copy out.
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- sql_result.mx 3 Jan 2008 09:41:17 -0000 1.76
+++ sql_result.mx 4 Jan 2008 17:58:49 -0000 1.77
@@ -1020,6 +1020,8 @@
size_t count;
stream *s;
BAT *order = NULL;
+ char *sep = t->tsep;
+ char *rsep = t->rsep;
s = open_wastream(t->filename);
if (!s || stream_errnr(s)) {
@@ -1027,15 +1029,19 @@
return -1;
}
+ sep = coerce(sep);
+ rsep = coerce(rsep);
if (!t->order) {
- res = mvc_export_row(m, s, t, "", t->tsep, t->rsep, t->ssep);
+ res = mvc_export_row(m, s, t, "", sep, rsep, t->ssep);
} else {
order = BATdescriptor(t->order);
count = BATcount(order);
- res = mvc_export_table(m, s, t, order, 0, count, "", t->tsep,
t->rsep, t->ssep);
+ res = mvc_export_table(m, s, t, order, 0, count, "", sep, rsep,
t->ssep);
BBPunfix(order->batCacheid);
m->results = res_tables_remove(m->results, t);
}
+ _DELETE(sep);
+ _DELETE(rsep);
stream_close(s);
stream_destroy(s);
return res;
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- sql_gencode.mx 3 Jan 2008 09:41:17 -0000 1.262
+++ sql_gencode.mx 4 Jan 2008 17:58:49 -0000 1.263
@@ -1659,12 +1659,12 @@
node *n = s->op2.lval->h;
char *sep = n->data;
char *rsep = n->next->data;
- char *ssep =
sql_escape_ident(n->next->next->data);
+ char *ssep = n->next->next->data;
+
k = pushArgument(mb, k, file);
k = pushStr(mb, k, sep);
k = pushStr(mb, k, rsep);
k = pushStr(mb, k, ssep);
- _DELETE(ssep);
} else {
k = pushInt(mb, k, sql->mvc->type);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
