Changeset: b931b26e5f9e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b931b26e5f9e
Modified Files:
sql/server/rel_select.c
Branch: Oct2014
Log Message:
use str(NULL) in case of ifthenelse( cond, NULL, NULL).
diffs (25 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
@@ -4092,6 +4092,8 @@ rel_case(mvc *sql, sql_rel **rel, int to
tpe = &rtype;
}
restype = tpe;
+ if (restype->type->localtype == TYPE_void) /* NULL */
+ restype = sql_bind_localtype("str");
if (!result || !(result = rel_check_type(sql, restype, result,
type_equal)))
return NULL;
@@ -4100,9 +4102,9 @@ rel_case(mvc *sql, sql_rel **rel, int to
if (!res)
return NULL;
} else {
- sql_exp *a = exp_atom(sql->sa, atom_general(sql->sa, restype,
NULL));
-
- res = a;
+ if (restype->type->localtype == TYPE_void) /* NULL */
+ restype = sql_bind_localtype("str");
+ res = exp_atom(sql->sa, atom_general(sql->sa, restype, NULL));
}
for (n = conds->h, m = results->h; n && m; n = n->next, m = m->next) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
