Changeset: e071e9730a51 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e071e9730a51
Modified Files:
sql/server/rel_updates.c
Branch: Oct2020
Log Message:
Declared tables don't have schema
diffs (22 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1231,7 +1231,7 @@ validate_merge_update_delete(mvc *sql, s
(upd_token == SQL_DELETE) ? "DELETE" : "UPDATE",
join_rel_name ? " '" : "", join_rel_name ?
join_rel_name : "", join_rel_name ? "'" : "",
alias ? "relation" : "table",
- alias ? alias : t->s->base.name, alias ? "" : ".",
alias ? "" : t->base.name);
+ alias ? alias : t->s ? t->s->base.name : "", alias ?
"" : ".", alias ? "" : t->base.name);
ex = exp_exception(sql->sa, ex, buf);
res = rel_exception(sql->sa, groupby, NULL,
list_append(new_exp_list(sql->sa), ex));
@@ -1256,7 +1256,8 @@ merge_into_table(sql_query *query, dlist
if (!(t = find_table_on_scope(sql, &s, sname, tname)))
return sql_error(sql, 02, SQLSTATE(42S02) "MERGE: no such table
'%s'", tname);
if (!table_privs(sql, t, PRIV_SELECT))
- return sql_error(sql, 02, SQLSTATE(42000) "MERGE: access denied
for %s to table '%s.%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name, tname);
+ return sql_error(sql, 02, SQLSTATE(42000) "MERGE: access denied
for %s to table %s%s%s'%s'",
+
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), t->s ? "'":"", t->s ? t->s->base.name : "", t->s ? "'.":"",
tname);
if (isMergeTable(t))
return sql_error(sql, 02, SQLSTATE(42000) "MERGE: merge
statements not available for merge tables yet");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
