Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26794/src/backends/monet4
Modified Files:
sql_gencode.mx sql_result.mx sql_server.mx
Log Message:
propagated changes of Friday Mar 21 2008
from the SQL_2-22 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/test/bugs/Tests/All,1.106.2.5
add test script for bug in copy into
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/backends/monet4/sql_gencode.mx,1.168.2.2
src/backends/monet4/sql_result.mx,1.80.2.2
src/backends/monet4/sql_server.mx,1.189.2.7
src/backends/monet5/sql.mx,1.251.2.5
src/backends/monet5/sql_gencode.mx,1.267.2.2
src/backends/monet5/sql_result.mx,1.82.2.2
fixed bug in copy into, we now properly pass the schema(name) to the mil/mal
level.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/test/BugTracker/Tests/All,1.80.2.11
src/test/BugTracker/Tests/drop_function.SF-1910396.sql,1.1.2.1
src/test/BugTracker/Tests/drop_function.SF-1910396.stable.err,1.1.2.1
src/test/BugTracker/Tests/drop_function.SF-1910396.stable.out,1.1.2.1
test script + stable output for bug 1910396
drop function without arguments...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/21 - nielsnes: src/server/sql_select.mx,1.219.2.10
we need to check for a failed call to sql_value_exp else we could crash on
incorrect queries
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_result.mx,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- sql_result.mx 18 Feb 2008 10:52:01 -0000 1.82
+++ sql_result.mx 21 Mar 2008 09:39:31 -0000 1.83
@@ -34,7 +34,7 @@
extern int mvc_export_prepare(mvc *c, stream *s, cq *q, str w);
extern int mvc_export_chunk(mvc *m, stream *s, int res_id, size_t offset,
size_t nr);
-extern BAT *mvc_import_table(mvc *c, bstream *s, char *tname, char *sep, char
*rsep, char *ssep, char *ns, int nr, int offset);
+extern BAT *mvc_import_table(mvc *c, bstream *s, char *sname, char *tname,
char *sep, char *rsep, char *ssep, char *ns, int nr, int offset);
extern int mvc_result_table(mvc *m, int nr_cols, int type, BAT *order);
extern int mvc_result_column(mvc *m, char *tn, char *name, char *typename, int
digits, int scale, BAT *b);
@@ -410,10 +410,11 @@
BAT *
-mvc_import_table(mvc *m, bstream *bs, char *tname, char *sep, char *rsep, char
*ssep, char *ns, int sz, int offset)
+mvc_import_table(mvc *m, bstream *bs, char *sname, char *tname, char *sep,
char *rsep, char *ssep, char *ns, int sz, int offset)
{
int i = 0;
- sql_table *t = mvc_bind_table(m, m->session->schema, tname);
+ sql_schema *s = mvc_bind_schema(m, sname);
+ sql_table *t = mvc_bind_table(m, s, tname);
node *n;
BAT *bats = NULL;
ascii as;
Index: sql_server.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_server.mx,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- sql_server.mx 7 Mar 2008 09:45:31 -0000 1.196
+++ sql_server.mx 21 Mar 2008 09:39:31 -0000 1.197
@@ -150,7 +150,7 @@
.COMMAND mvc_export_value(mvc m, Stream s, int qtype, str tname, str
name, str typename, int digits, int scale, int eclass, any val, str w) =
mvc_export_value_wrap; "export a single value onto the stream s"
- .COMMAND mvc_import_table( mvc c, Bstream s, str tname, str sep, str
rsep, str ssep, str ns, int nr, int offset) : BAT[str,BAT] =
mvc_import_table_wrap;
+ .COMMAND mvc_import_table( mvc c, Bstream s, str sname, str tname, str
sep, str rsep, str ssep, str ns, int nr, int offset) : BAT[str,BAT] =
mvc_import_table_wrap;
"import a table from stream s with the given tuple and record
seperators (sep/rsep)"
@= mel_round
@@ -806,9 +806,9 @@
}
int
-mvc_import_table_wrap(BAT **res, mvc *c, Bstream *s, str tname, str sep, str
rsep, str ssep, str ns, int *sz, int *offset)
+mvc_import_table_wrap(BAT **res, mvc *c, Bstream *s, str sname, str tname, str
sep, str rsep, str ssep, str ns, int *sz, int *offset)
{
- *res = mvc_import_table(*(mvc **) c, *(bstream **) s, tname, sep, rsep,
ssep, ns, *sz, *offset);
+ *res = mvc_import_table(*(mvc **) c, *(bstream **) s, sname, tname,
sep, rsep, ssep, ns, *sz, *offset);
if (*res == NULL) {
GDKerror("importTable: failed to import table");
return GDK_FAIL;
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- sql_gencode.mx 6 Mar 2008 08:33:35 -0000 1.171
+++ sql_gencode.mx 21 Mar 2008 09:39:31 -0000 1.172
@@ -1188,6 +1188,7 @@
dump_2(sql, s, "find", nr);
break;
case st_import:{
+ char *sname = s->op1.stval->op1.tval->s->base.name;
char *tname = s->op1.stval->op1.tval->base.name;
node *n = s->op2.lval->h;
char *sep = n->data;
@@ -1207,14 +1208,14 @@
assert(len <= buflen);
len += snprintf(buf + len, buflen - len, "var
f%d := bstream_create(f%ds, 1024*1024);\n", file, file);
assert(len <= buflen);
- len += snprintf(buf + len, buflen - len, "var
s%d := mvc_import_table( myc, f%d, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", %d,
%d);\n", -s->nr, file, tname, sep, rsep, ssep, ns, nr_rec, offset);
+ len += snprintf(buf + len, buflen - len, "var
s%d := mvc_import_table( myc, f%d, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\",
\"%s\", %d, %d);\n", -s->nr, file, sname, tname, sep, rsep, ssep, ns, nr_rec,
offset);
assert(len <= buflen);
len += snprintf(buf + len, buflen - len,
"bstream_destroy(f%d);\n", file);
assert(len <= buflen);
len += snprintf(buf + len, buflen - len,
"stream_close(f%ds);\n", file);
assert(len <= buflen);
} else {
- len += snprintf(buf + len, buflen - len, "var
s%d := mvc_import_table( myc, Input, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\",
%d, %d);\n", -s->nr, tname, sep, rsep, ssep, ns, nr_rec, offset);
+ len += snprintf(buf + len, buflen - len, "var
s%d := mvc_import_table( myc, Input, \"%s\", \"%s\", \"%s\", \"%s\", \"%s\",
\"%s\", %d, %d);\n", -s->nr, sname, tname, sep, rsep, ssep, ns, nr_rec, offset);
assert(len <= buflen);
}
dump(sql, buf, len, -s->nr);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
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
