MonetDB: Apr2019 - Restore lost dependencies on SQL types.

[Sjoerd Mullender]

Changeset: 3a71b53239dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a71b53239dc
Modified Files:
        sql/backends/monet5/sql_cat.c
Branch: Apr2019
Log Message:

Restore lost dependencies on SQL types.


diffs (31 lines):

diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -766,10 +766,15 @@ create_func(mvc *sql, char *sname, char 
                s = cur_schema(sql);
        nf = mvc_create_func(sql, NULL, s, f->base.name, f->ops, f->res, 
f->type, f->lang, f->mod, f->imp, f->query, f->varres, f->vararg, f->system);
        assert(nf);
-       if (nf->lang == FUNC_LANG_INT || nf->lang == FUNC_LANG_MAL) { /* 
FUNC_LANG_INT shouldn't be reachable, but leave it here */
+       switch (nf->lang) {
+       case FUNC_LANG_INT:
+       case FUNC_LANG_MAL: /* shouldn't be reachable, but leave it here */
                if (!backend_resolve_function(sql, nf))
                        throw(SQL,"sql.create_func", SQLSTATE(3F000) "CREATE 
%s%s: external name %s.%s not bound", KF, F, nf->mod, nf->base.name);
-       } else if (nf->lang == FUNC_LANG_SQL) {
+               if (nf->query == NULL)
+                       break;
+               /* fall through */
+       case FUNC_LANG_SQL: {
                char *buf;
                sql_rel *r = NULL;
                sql_allocator *sa = sql->sa;
@@ -809,6 +814,9 @@ create_func(mvc *sql, char *sname, char 
                sa_destroy(sql->sa);
                sql->sa = sa;
        }
+       default:
+               break;
+       }
        return MAL_SUCCEED;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list