Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11796/src/server
Modified Files:
rel_select.mx
Log Message:
fixed bug in sql join statements (column names were ambiguous)
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- rel_select.mx 27 Jan 2008 15:40:08 -0000 1.56
+++ rel_select.mx 27 Jan 2008 17:28:32 -0000 1.57
@@ -3927,7 +3927,6 @@
for (n = ls->h, m = rs->h; n && m; n = n->next, m = m->next) {
sql_exp *le = exp_dup(n->data), *lb = le;
sql_exp *re = exp_dup(m->data), *rb = re;
- //char *nme = exp_name(le);
if ((rel_convert_types(sql, &le, &re, 1, type_set) <
0)) {
if (le)
@@ -3939,10 +3938,6 @@
if (le != lb || re != rb)
changes = 1;
append(nls, le);
-/*
- if (nme) {
- exp_setname(re, nme);
-*/
append(nrs, re);
}
if (changes) {
@@ -4105,8 +4100,12 @@
}
list_destroy(exps);
rel = rel_project(rel, outexps);
+ if (!rel->name)
+ rel_label(rel, ++sql->label);
} else { /* ! js -> natural join */
rel = join_on_column_name(sql, rel, t1, t2, 0);
+ if (!rel->name)
+ rel_label(rel, ++sql->label);
}
if (!rel)
return NULL;
-------------------------------------------------------------------------
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
