Changeset: 198892f13079 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/198892f13079
Modified Files:
sql/server/rel_rel.c
Branch: default
Log Message:
First update relation name, then append expression
diffs (38 lines):
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1090,10 +1090,10 @@ list *
if (basecol && !is_basecol(e))
continue;
if (intern || !is_intern(e)) {
- append(exps, e = exp_alias_or_copy(sql,
tname, exp_name(e), rel, e));
+ e = exp_alias_or_copy(sql, tname,
exp_name(e), rel, e);
if (!settname) /* noname use alias */
exp_setrelname(sql->sa, e,
label);
-
+ append(exps, e);
}
}
return exps;
@@ -1120,10 +1120,10 @@ list *
if (basecol && !is_basecol(e))
continue;
if (intern || !is_intern(e)) {
- append(exps, e = exp_alias_or_copy(sql,
tname, exp_name(e), rel, e));
+ e = exp_alias_or_copy(sql, tname,
exp_name(e), rel, e);
if (!settname) /* noname use alias */
exp_setrelname(sql->sa, e,
label);
-
+ append(exps, e);
}
}
return exps;
@@ -1145,6 +1145,8 @@ list *
if (!settname) /* noname use alias */
exp_setrelname(sql->sa, e, label);
}
+ if (!settname)
+ list_hash_clear(lexps);
}
return lexps;
case op_ddl:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
