Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20842/src/server
Modified Files:
sql_select.mx sql_updates.mx
Log Message:
removed bogus assert
made double quoted strings the default for copy into again (this is needed
as we should be able to load old dumps!)
approved output (errors) for coalesce for m4 and m5
approved ouput for new signature of mvc_export_file
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- sql_select.mx 2 Jan 2008 17:24:36 -0000 1.212
+++ sql_select.mx 3 Jan 2008 11:45:17 -0000 1.213
@@ -504,7 +504,6 @@
return stmt_dup(s);
}
}
- assert(0);
return NULL;
}
Index: sql_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_updates.mx,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- sql_updates.mx 3 Jan 2008 09:41:18 -0000 1.129
+++ sql_updates.mx 3 Jan 2008 11:45:19 -0000 1.130
@@ -1371,9 +1371,6 @@
return res;
}
-/* TODO rewrite on parser level into, INSERT INTO x select * from import()
- where import is a function returning a table of to be inserted values.
- */
static stmt *
sql_import(mvc *sql, sql_table *t, char *tsep, char *rsep, char *ssep, char
*filename, int nr, int offset)
{
@@ -1407,7 +1404,7 @@
sql_table *t = NULL;
char *tsep = seps->h->data.sval;
char *rsep = seps->h->next->data.sval;
- char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"";
+ char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"\"";
list *slist;
int nr = (nr_offset)?nr_offset->h->data.ival:-1;
int offset = (nr_offset)?nr_offset->h->next->data.ival:0;
@@ -1450,7 +1447,7 @@
{
char *tsep = seps->h->data.sval;
char *rsep = seps->h->next->data.sval;
- char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"";
+ char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"\"";
stmt *s = flat_subquery(sql, sq);
list *slist;
-------------------------------------------------------------------------
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
