Changeset: e94f215a8bdc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e94f215a8bdc
Modified Files:
sql/backends/monet5/sql_cat.c
sql/server/rel_psm.c
sql/server/rel_schema.c
Branch: default
Log Message:
Merge with Nov2019
diffs (117 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
@@ -473,7 +473,7 @@ drop_trigger(mvc *sql, char *sname, char
s = cur_schema(sql);
assert(s);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_trigger",SQLSTATE(3F000) "DROP TRIGGER:
access denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ throw(SQL,"sql.drop_trigger",SQLSTATE(3F000) "DROP TRIGGER:
access denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
if ((tri = mvc_bind_trigger(sql, s, tname)) == NULL) {
if(if_exists)
@@ -510,7 +510,7 @@ drop_table(mvc *sql, char *sname, char *
} else if (t->system) {
throw(SQL,"sql.droptable", SQLSTATE(42000) "DROP TABLE: cannot
drop system table '%s'", tname);
} else if (!mvc_schema_privs(sql, s) && !(isTempSchema(s) &&
t->persistence == SQL_LOCAL_TEMP)) {
- throw(SQL,"sql.droptable",SQLSTATE(42000) "DROP TABLE: access
denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ throw(SQL,"sql.droptable",SQLSTATE(42000) "DROP TABLE: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
}
if (!drop_action && t->keys.set) {
for (n = t->keys.set->h; n; n = n->next) {
@@ -602,7 +602,7 @@ drop_index(Client cntxt, mvc *sql, char
if (!i) {
throw(SQL,"sql.drop_index", SQLSTATE(42S12) "DROP INDEX: no
such index '%s'", iname);
} else if (!mvc_schema_privs(sql, s)) {
- throw(SQL,"sql.drop_index", SQLSTATE(42000) "DROP INDEX: access
denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ throw(SQL,"sql.drop_index", SQLSTATE(42000) "DROP INDEX: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
} else {
if (i->type == ordered_idx) {
sql_kc *ic = i->columns->h->data;
@@ -730,7 +730,7 @@ drop_func(mvc *sql, char *sname, char *n
sql_func *func = n->data;
if (!mvc_schema_privs(sql, s)) {
- throw(SQL,"sql.drop_func", SQLSTATE(42000)
"DROP %s%s: access denied for %s to schema ;'%s'", KF, F, stack_get_string(sql,
"current_user"), s->base.name);
+ throw(SQL,"sql.drop_func", SQLSTATE(42000)
"DROP %s%s: access denied for %s to schema '%s'", KF, F, stack_get_string(sql,
"current_user"), s->base.name);
}
if (!action && mvc_check_dependency(sql, func->base.id,
!IS_PROC(func) ? FUNC_DEPENDENCY : PROC_DEPENDENCY, NULL))
throw(SQL,"sql.drop_func", SQLSTATE(42000)
"DROP %s%s: there are database objects dependent on %s%s %s;", KF, F, kf, f,
func->base.name);
@@ -747,7 +747,7 @@ drop_func(mvc *sql, char *sname, char *n
if (!mvc_schema_privs(sql, s)) {
list_destroy(list_func);
- throw(SQL,"sql.drop_func", SQLSTATE(42000) "DROP %s%s:
access denied for %s to schema ;'%s'", KF, F, stack_get_string(sql,
"current_user"), s->base.name);
+ throw(SQL,"sql.drop_func", SQLSTATE(42000) "DROP %s%s:
access denied for %s to schema '%s'", KF, F, stack_get_string(sql,
"current_user"), s->base.name);
}
for (n = list_func->h; n; n = n->next) {
sql_func *func = n->data;
@@ -1055,7 +1055,7 @@ SQLdrop_schema(Client cntxt, MalBlkPtr m
if(!if_exists)
throw(SQL,"sql.drop_schema",SQLSTATE(3F000) "DROP
SCHEMA: name %s does not exist", sname);
} else if (!mvc_schema_privs(sql, s)) {
- throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
access denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
access denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
} else if (s == cur_schema(sql)) {
throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
cannot drop current schema");
} else if (s->system) {
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
@@ -819,7 +819,7 @@ rel_create_func(sql_query *query, dlist
if (replace) {
sql_func *func = sf->func;
if (!mvc_schema_privs(sql, s))
- return sql_error(sql, 02, SQLSTATE(42000)
"CREATE OR REPLACE %s%s: access denied for %s to schema ;'%s'", KF, F,
stack_get_string(sql, "current_user"), s->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000)
"CREATE OR REPLACE %s%s: access denied for %s to schema '%s'", KF, F,
stack_get_string(sql, "current_user"), s->base.name);
if (mvc_check_dependency(sql, func->base.id,
!IS_PROC(func) ? FUNC_DEPENDENCY : PROC_DEPENDENCY, NULL))
return sql_error(sql, 02, SQLSTATE(42000)
"CREATE OR REPLACE %s%s: there are database objects dependent on %s%s %s;", KF,
F, kf, fn, func->base.name);
if (!func->s)
@@ -1223,7 +1223,7 @@ create_trigger(sql_query *query, dlist *
}
if (create && !mvc_schema_privs(sql, ss))
- return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: access
denied for %s to schema ;'%s'", base, stack_get_string(sql, "current_user"),
ss->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: access
denied for %s to schema '%s'", base, stack_get_string(sql, "current_user"),
ss->base.name);
if (create && !(t = mvc_bind_table(sql, ss, tname)))
return sql_error(sql, 02, SQLSTATE(42000) "%s TRIGGER: unknown
table '%s'", base, tname);
if (create && isView(t))
@@ -1345,7 +1345,7 @@ drop_trigger(mvc *sql, dlist *qname, int
return sql_error(sql, 02, SQLSTATE(3F000) "DROP TRIGGER: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, ss))
- return sql_error(sql, 02, SQLSTATE(3F000) "DROP TRIGGER: access
denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
ss->base.name);
+ return sql_error(sql, 02, SQLSTATE(3F000) "DROP TRIGGER: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
ss->base.name);
return rel_drop_trigger(sql, ss->base.name, tname, if_exists);
}
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1179,7 +1179,7 @@ rel_create_view(sql_query *query, sql_sc
s = cur_schema(sql);
if (create && (!mvc_schema_privs(sql, s) && !(isTempSchema(s) &&
persistent == SQL_LOCAL_TEMP))) {
- return sql_error(sql, 02, SQLSTATE(42000) "%s VIEW: access
denied for %s to schema ;'%s'", base, stack_get_string(sql, "current_user"),
s->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "%s VIEW: access
denied for %s to schema '%s'", base, stack_get_string(sql, "current_user"),
s->base.name);
}
if (create && (t = mvc_bind_table(sql, s, name)) != NULL) {
@@ -1312,7 +1312,7 @@ rel_drop_type(mvc *sql, dlist *qname, in
if (schema_bind_type(sql, s, name) == NULL) {
return sql_error(sql, 02, SQLSTATE(42S01) "DROP TYPE: type '%s'
does not exist", name);
} else if (!mvc_schema_privs(sql, s)) {
- return sql_error(sql, 02, SQLSTATE(42000) "DROP TYPE: access
denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "DROP TYPE: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
}
return rel_schema2(sql->sa, ddl_drop_type, s->base.name, name,
drop_action);
}
@@ -1332,7 +1332,7 @@ rel_create_type(mvc *sql, dlist *qname,
if (schema_bind_type(sql, s, name) != NULL) {
return sql_error(sql, 02, SQLSTATE(42S01) "CREATE TYPE: name
'%s' already in use", name);
} else if (!mvc_schema_privs(sql, s)) {
- return sql_error(sql, 02, SQLSTATE(42000) "CREATE TYPE: access
denied for %s to schema ;'%s'", stack_get_string(sql, "current_user"),
s->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "CREATE TYPE: access
denied for %s to schema '%s'", stack_get_string(sql, "current_user"),
s->base.name);
}
return rel_schema3(sql->sa, ddl_create_type, s->base.name, name, impl);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
