MonetDB: Jul2015 - don't use 3 level deep table names.

[Niels Nes]

Changeset: f3dc30e3aa36 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3dc30e3aa36
Modified Files:
        sql/server/rel_select.c
Branch: Jul2015
Log Message:

don't use 3 level deep table names.


diffs (24 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
@@ -1782,14 +1782,17 @@ table_ref(mvc *sql, sql_rel *rel, symbol
 
        (void)rel;
        if (tableref->token == SQL_NAME) {
+               dlist *name = tableref->data.lval->h->data.lval;
                sql_rel *temp_table = NULL;
-               char *sname = qname_schema(tableref->data.lval->h->data.lval);
+               char *sname = qname_schema(name);
                sql_schema *s = NULL;
-               tname = qname_table(tableref->data.lval->h->data.lval);
+               tname = qname_table(name);
+
+               if (dlist_length(name) > 2)
+                       return sql_error(sql, 02, "3F000!SELECT: only a schema 
and table name expected");
 
                if (sname && !(s=mvc_bind_schema(sql,sname)))
                        return sql_error(sql, 02, "3F000!SELECT: no such schema 
'%s'", sname);
-               /* TODO: search path */
                if (!t && !sname) {
                        t = stack_find_table(sql, tname);
                        if (!t && sql->use_views) 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list