Changeset: 13768387d528 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/13768387d528
Modified Files:
gdk/gdk_join.c
sql/server/rel_exp.c
Branch: groupjoin
Log Message:
Merge with default branch.
diffs (25 lines):
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1209,16 +1209,18 @@ exp_refers( sql_exp *p, sql_exp *c)
// at first they need to have the same expression names
if (!p->alias.name || !c->r || strcmp(p->alias.name, c->r) != 0)
return 0;
+ if (!c->l)
+ return 1;
// then compare the relation names
- if (c->l) {
+ if (c->l && (p->alias.rname || p->l)) {
// if the parent has an alias for the relation name
compare with the child's relation name
if (p->alias.rname && strcmp(p->alias.rname, c->l) != 0)
return 0;
// if the parent does NOT have a relation name alias
compare his relation name with the child's
- if (!p->alias.rname && p->l && strcmp(p->l, c->l) != 0)
+ if (!p->alias.rname && p->l && (strcmp(p->l, c->l) != 0
|| strcmp(p->alias.name, p->r) !=0))
return 0;
+ return 1;
}
- return 1;
}
return 0;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
