Changeset: 4ed7d0ca8b5d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ed7d0ca8b5d
Modified Files:
sql/src/server/rel_bin.mx
Branch: default
Log Message:
handle no_idx in insert case
diffs (25 lines):
diff -r b53d2f35788b -r 4ed7d0ca8b5d sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Fri May 21 16:21:06 2010 +0200
+++ b/sql/src/server/rel_bin.mx Fri May 21 16:30:04 2010 +0200
@@ -2065,7 +2065,7 @@
s = stmt_binop(stmt_aggr(s, NULL, cnt, 1), stmt_atom_wrd(0),
ne);
/* 2e stage: find out if inserted are unique */
- if (!idx_inserts || idx_inserts->nrcols) { /* insert
columns not atoms */
+ if ((!idx_inserts && nth(inserts,0)->nrcols) || (idx_inserts &&
idx_inserts->nrcols)) { /* insert columns not atoms */
#if 0
sql_subtype *Oid = sql_bind_localtype("oid");
sql_subfunc *nu, *or =
sql_bind_func_result(sql->session->schema, "or", bt, bt, bt);
@@ -2090,10 +2090,9 @@
/* combine results */
s = stmt_binop(s, ssum, or);
#else
- stmt *ss;
+ stmt *ss = NULL;
sql_subfunc *or =
sql_bind_func_result(sql->session->schema, "or", bt, bt, bt);
- /* implementation uses sort,refine, keyed check */
- ss = NULL;
+ /* implementation uses sort,refine, key check */
for (m = k->columns->h; m; m = m->next) {
sql_kc *c = m->data;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
