MonetDB: Nov2019 - Don't override rel_subquery error

[Pedro Ferreira]

Changeset: 6d984fdc73fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d984fdc73fa
Modified Files:
        sql/server/rel_psm.c
Branch: Nov2019
Log Message:

Don't override rel_subquery error


diffs (14 lines):

diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -106,7 +106,9 @@ psm_set_exp(sql_query *query, dnode *n)
                node *n;
                list *b;
 
-               if (!rel_val || !is_project(rel_val->op) || dlist_length(vars) 
!= list_length(rel_val->exps))
+               if (!rel_val)
+                       return NULL;
+               if (!is_project(rel_val->op) || dlist_length(vars) != 
list_length(rel_val->exps))
                        return sql_error(sql, 02, SQLSTATE(42000) "SET: Number 
of variables not equal to number of supplied values");
 
                b = sa_list(sql->sa);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list