Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12310/src/server
Modified Files:
Tag: Nov2009
rel_updates.mx
Log Message:
fixed bug, ie load all files in a copy into file list.
Index: rel_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_updates.mx,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- rel_updates.mx 22 Sep 2009 11:02:53 -0000 1.9
+++ rel_updates.mx 26 Nov 2009 19:47:35 -0000 1.9.2.1
@@ -523,13 +523,13 @@
append(exps, exp_column(t->base.name, c->base.name, &c->type,
CARD_MULTI, c->null, 0));
}
res = rel_table_func( import, exps);
- res = rel_insert_cluster(sql, t, res);
return res;
}
static sql_rel *
copyfrom(mvc *sql, dlist *qname, dlist *files, dlist *seps, dlist *nr_offset,
str null_string)
{
+ sql_rel *rel = NULL;
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
sql_schema *s = NULL;
@@ -569,11 +569,22 @@
for (; n; n = n->next) {
char *fname = n->data.sval;
+ sql_rel *nrel = rel_import(sql, t, tsep, rsep, ssep,
ns, fname, nr, offset);
- return rel_import(sql, t, tsep, rsep, ssep, ns, fname,
nr, offset);
+ if (!rel)
+ rel = nrel;
+ else
+ rel = rel_setop(rel, nrel, op_union);
+ if (!rel)
+ return rel;
}
+ } else {
+ rel = rel_import(sql, t, tsep, rsep, ssep, ns, NULL, nr,
offset);
}
- return rel_import(sql, t, tsep, rsep, ssep, ns, NULL, nr, offset);
+ if (!rel)
+ return rel;
+ rel = rel_insert_cluster(sql, t, rel);
+ return rel;
}
static sql_rel *
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
