Changeset: ed577a629cbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed577a629cbd
Modified Files:
sql/server/rel_select.c
Branch: RIntegration-default
Log Message:
make sure we try aggregates when binairy function fail.
diffs (35 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3639,17 +3639,23 @@ rel_binop(mvc *sql, sql_rel **rel, symbo
return rel_aggr(sql, rel, se, f);
}
+ if (sname)
+ s = mvc_bind_schema(sql, sname);
+
+ if (type == F_FUNC) {
+ sql_subfunc *func = sql_find_func(sql->sa, s, fname, 2, F_AGGR);
+ if (func) {
+ if (!l || !r) { /* reset error */
+ sql->session->status = 0;
+ sql->errstr[0] = '\0';
+ }
+ return _rel_aggr(sql, rel, 0, s, fname, dl->next, f);
+ }
+ }
+
if (!l || !r)
return NULL;
- if (sname)
- s = mvc_bind_schema(sql, sname);
-
- if (type == F_FUNC) {
- sql_subfunc *func = sql_find_func(sql->sa, s, fname, 2, F_AGGR);
- if (func)
- return _rel_aggr(sql, rel, 0, s, fname, dl->next, f);
- }
return rel_binop_(sql, l, r, s, fname, ek.card);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
