Changeset: 77a12ee75fec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77a12ee75fec
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_upgrades.c
Branch: clean-candidates
Log Message:
Merged with default
diffs (truncated from 818 to 300 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -321,7 +321,7 @@ create_table_or_view(mvc *sql, char* sna
if (mvc_bind_table(sql, s, t->base.name)) {
return sql_message(SQLSTATE(42S01) "%s TABLE: name '%s' already
in use", action, t->base.name);
} else if (temp != SQL_DECLARED_TABLE && (!mvc_schema_privs(sql, s) &&
!(isTempSchema(s) && temp == SQL_LOCAL_TEMP))) {
- return sql_message(SQLSTATE(42000) "%s TABLE: insufficient
privileges for user '%s' in schema '%s'", action,
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ return sql_message(SQLSTATE(42000) "%s TABLE: insufficient
privileges for user '%s' in schema '%s'", action, get_string_global_var(sql,
"current_user"), s->base.name);
} else if (temp == SQL_DECLARED_TABLE && !list_empty(t->keys.set)) {
return sql_message(SQLSTATE(42000) "%s TABLE: '%s' cannot have
constraints", action, t->base.name);
}
@@ -466,7 +466,7 @@ create_table_from_emit(Client cntxt, cha
if (!(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- return sql_error(sql, 02, SQLSTATE(42000) "CREATE TABLE: Access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ return sql_error(sql, 02, SQLSTATE(42000) "CREATE TABLE: Access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
s->base.name);
if (!(t = mvc_create_table(sql, s, tname, tt_table, 0,
SQL_DECLARED_TABLE, CA_COMMIT, -1, 0)))
return sql_error(sql, 02, SQLSTATE(3F000) "CREATE TABLE: could
not create table '%s'", tname);
@@ -783,7 +783,7 @@ mvc_next_value(Client cntxt, MalBlkPtr m
if (!(s = mvc_bind_schema(be->mvc, sname)))
throw(SQL, "sql.next_value", SQLSTATE(3F000) "Cannot find the
schema %s", sname);
if (!mvc_schema_privs(be->mvc, s))
- throw(SQL, "sql.next_value", SQLSTATE(42000) "Access denied for
%s to schema '%s'", sqlvar_get_string(find_global_var(be->mvc,
mvc_bind_schema(be->mvc, "sys"), "current_user")), s->base.name);
+ throw(SQL, "sql.next_value", SQLSTATE(42000) "Access denied for
%s to schema '%s'", get_string_global_var(be->mvc, "current_user"),
s->base.name);
if (!(seq = find_sql_sequence(s, seqname)))
throw(SQL, "sql.next_value", SQLSTATE(HY050) "Cannot find the
sequence %s.%s", sname, seqname);
@@ -897,7 +897,7 @@ mvc_bat_next_get_value(Client cntxt, Mal
goto bailout;
}
if (bulk_func == seqbulk_next_value &&
!mvc_schema_privs(m, s)) {
- msg = createException(SQL, call,
SQLSTATE(42000) "Access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(m, mvc_bind_schema(m, "sys"),
"current_user")), s->base.name);
+ msg = createException(SQL, call,
SQLSTATE(42000) "Access denied for %s to schema '%s'", get_string_global_var(m,
"current_user"), s->base.name);
goto bailout;
}
if (!(seq = find_sql_sequence(s, nseqname)) || !(sb =
seqbulk_create(seq, BATcount(it)))) {
@@ -978,7 +978,7 @@ mvc_restart_seq(Client cntxt, MalBlkPtr
if (!(s = mvc_bind_schema(m, sname)))
throw(SQL, "sql.restart", SQLSTATE(3F000) "Cannot find the
schema %s", sname);
if (!mvc_schema_privs(m, s))
- throw(SQL, "sql.restart", SQLSTATE(42000) "Access denied for %s
to schema '%s'", sqlvar_get_string(find_global_var(m, mvc_bind_schema(m,
"sys"), "current_user")), s->base.name);
+ throw(SQL, "sql.restart", SQLSTATE(42000) "Access denied for %s
to schema '%s'", get_string_global_var(m, "current_user"), s->base.name);
if (!(seq = find_sql_sequence(s, seqname)))
throw(SQL, "sql.restart", SQLSTATE(HY050) "Failed to fetch
sequence %s.%s", sname, seqname);
if (is_lng_nil(start))
@@ -1085,7 +1085,7 @@ mvc_bat_restart_seq(Client cntxt, MalBlk
goto bailout;
}
if (!mvc_schema_privs(m, s)) {
- msg = createException(SQL, "sql.restart",
SQLSTATE(42000) "Access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(m, mvc_bind_schema(m, "sys"),
"current_user")), s->base.name);
+ msg = createException(SQL, "sql.restart",
SQLSTATE(42000) "Access denied for %s to schema '%s'", get_string_global_var(m,
"current_user"), s->base.name);
goto bailout;
}
if (!(seq = find_sql_sequence(s, nseqname)) || !(sb =
seqbulk_create(seq, BATcount(it)))) {
@@ -4278,7 +4278,7 @@ SQLdrop_hash(Client cntxt, MalBlkPtr mb,
if (s == NULL)
throw(SQL, "sql.drop_hash", SQLSTATE(3F000) "Schema missing
%s",sch);
if (!mvc_schema_privs(m, s))
- throw(SQL, "sql.drop_hash", SQLSTATE(42000) "Access denied for
%s to schema '%s'", sqlvar_get_string(find_global_var(m, mvc_bind_schema(m,
"sys"), "current_user")), s->base.name);
+ throw(SQL, "sql.drop_hash", SQLSTATE(42000) "Access denied for
%s to schema '%s'", get_string_global_var(m, "current_user"), s->base.name);
t = mvc_bind_table(m, s, tbl);
if (t == NULL)
throw(SQL, "sql.drop_hash", SQLSTATE(42S02) "Table missing
%s.%s",sch, tbl);
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
@@ -148,9 +148,9 @@ validate_alter_table_add_table(mvc *sql,
if (psname && !(ps = mvc_bind_schema(sql, psname)))
throw(SQL,call,SQLSTATE(3F000) "ALTER TABLE: no such schema
'%s'", psname);
if (!mvc_schema_privs(sql, ms))
- throw(SQL,call,SQLSTATE(42000) "ALTER TABLE: access denied for
%s to schema '%s'", sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql,
"sys"), "current_user")), ms->base.name);
+ throw(SQL,call,SQLSTATE(42000) "ALTER TABLE: access denied for
%s to schema '%s'", get_string_global_var(sql, "current_user"), ms->base.name);
if (!mvc_schema_privs(sql, ps))
- throw(SQL,call,SQLSTATE(42000) "ALTER TABLE: access denied for
%s to schema '%s'", sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql,
"sys"), "current_user")), ps->base.name);
+ throw(SQL,call,SQLSTATE(42000) "ALTER TABLE: access denied for
%s to schema '%s'", get_string_global_var(sql, "current_user"), ps->base.name);
if (!(rmt = mvc_bind_table(sql, ms, mtname)))
throw(SQL,call,SQLSTATE(42S02) "ALTER TABLE: no such table '%s'
in schema '%s'", ms->base.name, mtname);
if (!(rpt = mvc_bind_table(sql, ps, ptname)))
@@ -411,9 +411,9 @@ alter_table_del_table(mvc *sql, char *ms
if (psname && !(ps = mvc_bind_schema(sql, psname)))
throw(SQL,"sql.alter_table_del_table",SQLSTATE(3F000) "ALTER
TABLE: no such schema '%s'", psname);
if (!mvc_schema_privs(sql, ms))
- throw(SQL,"sql.alter_table_del_table",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), ms->base.name);
+ throw(SQL,"sql.alter_table_del_table",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), ms->base.name);
if (!mvc_schema_privs(sql, ps))
- throw(SQL,"sql.alter_table_del_table",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), ps->base.name);
+ throw(SQL,"sql.alter_table_del_table",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), ps->base.name);
if (!(mt = mvc_bind_table(sql, ms, mtname)))
throw(SQL,"sql.alter_table_del_table",SQLSTATE(42S02) "ALTER
TABLE: no such table '%s' in schema '%s'", ms->base.name, mtname);
if (!(pt = mvc_bind_table(sql, ps, ptname)))
@@ -437,7 +437,7 @@ alter_table_set_access(mvc *sql, char *s
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.alter_table_set_access",SQLSTATE(3F000) "ALTER
TABLE: no such schema '%s'", sname);
if (s && !mvc_schema_privs(sql, s))
- throw(SQL,"sql.alter_table_set_access",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ throw(SQL,"sql.alter_table_set_access",SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (!(t = mvc_bind_table(sql, s, tname)))
throw(SQL,"sql.alter_table_set_access",SQLSTATE(42S02) "ALTER
TABLE: no such table '%s' in schema '%s'", tname, s->base.name);
if (isMergeTable(t))
@@ -463,7 +463,7 @@ create_trigger(mvc *sql, char *sname, ch
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.create_trigger",SQLSTATE(3F000) "CREATE TRIGGER:
no such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.create_trigger",SQLSTATE(42000) "CREATE TRIGGER:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.create_trigger",SQLSTATE(42000) "CREATE TRIGGER:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (mvc_bind_trigger(sql, s, triggername))
throw(SQL,"sql.create_trigger",SQLSTATE(3F000) "CREATE TRIGGER:
name '%s' already in use", triggername);
if (!(t = mvc_bind_table(sql, s, tname)))
@@ -514,7 +514,7 @@ drop_trigger(mvc *sql, char *sname, char
throw(SQL,"sql.drop_trigger",SQLSTATE(3F000) "DROP TRIGGER: no
such schema '%s'", sname);
}
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_trigger",SQLSTATE(42000) "DROP TRIGGER:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_trigger",SQLSTATE(42000) "DROP TRIGGER:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if ((tri = mvc_bind_trigger(sql, s, tname)) == NULL) {
if (if_exists)
@@ -548,7 +548,7 @@ drop_table(mvc *sql, char *sname, char *
if (t->system)
throw(SQL,"sql.drop_table", SQLSTATE(42000) "DROP TABLE: cannot
drop system table '%s'", tname);
if (!mvc_schema_privs(sql, s) && !(isTempSchema(s) && t->persistence ==
SQL_LOCAL_TEMP))
- throw(SQL,"sql.drop_table", SQLSTATE(42000) "DROP TABLE: access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_table", SQLSTATE(42000) "DROP TABLE: access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
s->base.name);
if (!drop_action && t->keys.set) {
for (n = t->keys.set->h; n; n = n->next) {
sql_key *k = n->data;
@@ -593,7 +593,7 @@ drop_view(mvc *sql, char *sname, char *t
throw(SQL,"sql.drop_view",SQLSTATE(42S02) "DROP VIEW: unknown
view '%s'", tname);
}
if (!mvc_schema_privs(sql, ss) && !(isTempSchema(ss) && t &&
t->persistence == SQL_LOCAL_TEMP))
- throw(SQL,"sql.drop_view", SQLSTATE(42000) "DROP VIEW: access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), ss->base.name);
+ throw(SQL,"sql.drop_view", SQLSTATE(42000) "DROP VIEW: access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
ss->base.name);
if (!isView(t))
throw(SQL,"sql.drop_view", SQLSTATE(42000) "DROP VIEW: unable
to drop view '%s': is a table", tname);
if (t->system)
@@ -612,7 +612,7 @@ drop_key(mvc *sql, char *sname, char *kn
if (sname && !(ss = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.drop_key", SQLSTATE(3F000) "ALTER TABLE: no such
schema '%s'", sname);
if (!mvc_schema_privs(sql, ss))
- throw(SQL,"sql.drop_key", SQLSTATE(42000) "ALTER TABLE: access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), ss->base.name);
+ throw(SQL,"sql.drop_key", SQLSTATE(42000) "ALTER TABLE: access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
ss->base.name);
if ((key = mvc_bind_key(sql, ss, kname)) == NULL)
throw(SQL,"sql.drop_key", SQLSTATE(42000) "ALTER TABLE: no such
constraint '%s'", kname);
if (!drop_action && mvc_check_dependency(sql, key->base.id,
KEY_DEPENDENCY, NULL))
@@ -631,7 +631,7 @@ drop_index(Client cntxt, mvc *sql, char
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.drop_index", SQLSTATE(3F000) "DROP INDEX: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_index", SQLSTATE(42000) "DROP INDEX: access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_index", SQLSTATE(42000) "DROP INDEX: access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
s->base.name);
if (!(i = mvc_bind_idx(sql, s, iname)))
throw(SQL,"sql.drop_index", SQLSTATE(42S12) "DROP INDEX: no
such index '%s'", iname);
if (i->key)
@@ -666,7 +666,7 @@ create_seq(mvc *sql, char *sname, char *
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.create_seq", SQLSTATE(3F000) "CREATE SEQUENCE:
no such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.create_seq", SQLSTATE(42000) "CREATE SEQUENCE:
insufficient privileges for '%s' in schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ throw(SQL,"sql.create_seq", SQLSTATE(42000) "CREATE SEQUENCE:
insufficient privileges for '%s' in schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (find_sql_sequence(s, seq->base.name))
throw(SQL,"sql.create_seq", SQLSTATE(42000) "CREATE SEQUENCE:
name '%s' already in use", seq->base.name);
if (is_lng_nil(seq->start) || is_lng_nil(seq->minvalue) ||
is_lng_nil(seq->maxvalue) ||
@@ -692,7 +692,7 @@ alter_seq(mvc *sql, char *sname, char *s
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.alter_seq", SQLSTATE(3F000) "ALTER SEQUENCE: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.alter_seq", SQLSTATE(42000) "ALTER SEQUENCE:
insufficient privileges for '%s' in schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ throw(SQL,"sql.alter_seq", SQLSTATE(42000) "ALTER SEQUENCE:
insufficient privileges for '%s' in schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (!(nseq = find_sql_sequence(s, seq->base.name)))
throw(SQL,"sql.alter_seq", SQLSTATE(42000) "ALTER SEQUENCE: no
such sequence '%s'", seq->base.name);
/* if seq properties hold NULL values, then they should be ignored
during the update */
@@ -722,7 +722,7 @@ drop_seq(mvc *sql, char *sname, char *na
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.drop_seq", SQLSTATE(3F000) "DROP SEQUENCE: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_seq", SQLSTATE(42000) "DROP SEQUENCE:
insufficient privileges for '%s' in schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ throw(SQL,"sql.drop_seq", SQLSTATE(42000) "DROP SEQUENCE:
insufficient privileges for '%s' in schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (!(seq = find_sql_sequence(s, name)))
throw(SQL,"sql.drop_seq", SQLSTATE(42M35) "DROP SEQUENCE: no
such sequence '%s'", name);
if (mvc_check_dependency(sql, seq->base.id, BEDROPPED_DEPENDENCY, NULL))
@@ -746,7 +746,7 @@ drop_func(mvc *sql, char *sname, char *n
throw(SQL,"sql.drop_func", SQLSTATE(3F000) "DROP %s: no such
schema '%s'", F, sname);
}
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_func", SQLSTATE(42000) "DROP %s: access
denied for %s to schema '%s'", F, sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_func", SQLSTATE(42000) "DROP %s: access
denied for %s to schema '%s'", F, get_string_global_var(sql, "current_user"),
s->base.name);
if (fid >= 0) {
node *n = find_sql_func_node(s, fid);
if (n) {
@@ -795,7 +795,7 @@ create_func(mvc *sql, char *sname, char
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.create_func", SQLSTATE(3F000) "CREATE %s: no
such schema '%s'", F, sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.create_func", SQLSTATE(42000) "CREATE %s: access
denied for %s to schema '%s'", F, sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.create_func", SQLSTATE(42000) "CREATE %s: access
denied for %s to schema '%s'", F, get_string_global_var(sql, "current_user"),
s->base.name);
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);
switch (nf->lang) {
@@ -866,7 +866,7 @@ alter_table(Client cntxt, mvc *sql, char
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.alter_table", SQLSTATE(3F000) "ALTER TABLE: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s) && !(isTempSchema(s) && t->persistence ==
SQL_LOCAL_TEMP))
- throw(SQL,"sql.alter_table", SQLSTATE(42000) "ALTER TABLE:
insufficient privileges for user '%s' in schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), s->base.name);
+ throw(SQL,"sql.alter_table", SQLSTATE(42000) "ALTER TABLE:
insufficient privileges for user '%s' in schema '%s'",
get_string_global_var(sql, "current_user"), s->base.name);
if (!(nt = mvc_bind_table(sql, s, t->base.name)))
throw(SQL,"sql.alter_table", SQLSTATE(42S02) "ALTER TABLE: no
such table '%s'", t->base.name);
@@ -1072,7 +1072,7 @@ SQLcreate_schema(Client cntxt, MalBlkPtr
if (name && (auth_id = sql_find_auth(sql, name)) < 0)
throw(SQL,"sql.create_schema", SQLSTATE(42M32) "CREATE SCHEMA:
no such authorization '%s'", name);
if (sql->user_id != USER_MONETDB && sql->role_id != ROLE_SYSADMIN)
- throw(SQL,"sql.create_schema", SQLSTATE(42000) "CREATE SCHEMA:
insufficient privileges for user '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")));
+ throw(SQL,"sql.create_schema", SQLSTATE(42000) "CREATE SCHEMA:
insufficient privileges for user '%s'", get_string_global_var(sql,
"current_user"));
if (mvc_bind_schema(sql, sname))
throw(SQL,"sql.create_schema", SQLSTATE(3F000) "CREATE SCHEMA:
name '%s' already in use", sname);
(void) mvc_create_schema(sql, sname, auth_id, sql->user_id);
@@ -1098,7 +1098,7 @@ SQLdrop_schema(Client cntxt, MalBlkPtr m
return MAL_SUCCEED;
}
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (s == cur_schema(sql))
throw(SQL,"sql.drop_schema",SQLSTATE(42000) "DROP SCHEMA:
cannot drop current schema");
if (s->system)
@@ -1214,7 +1214,7 @@ SQLcreate_type(Client cntxt, MalBlkPtr m
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.create_type",SQLSTATE(3F000) "CREATE TYPE: no
such schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.create_type", SQLSTATE(42000) "CREATE TYPE:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.create_type", SQLSTATE(42000) "CREATE TYPE:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), s->base.name);
if (schema_bind_type(sql, s, name))
throw(SQL,"sql.create_type", SQLSTATE(42S02) "CREATE TYPE: type
'%s' already exists", name);
if (!mvc_create_type(sql, s, name, 0, 0, 0, impl))
@@ -1238,7 +1238,7 @@ SQLdrop_type(Client cntxt, MalBlkPtr mb,
if (sname && !(s = mvc_bind_schema(sql, sname)))
throw(SQL,"sql.drop_type",SQLSTATE(3F000) "DROP TYPE: no such
schema '%s'", sname);
if (!mvc_schema_privs(sql, s))
- throw(SQL,"sql.drop_type", SQLSTATE(42000) "DROP TYPE: access
denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), s->base.name);
+ throw(SQL,"sql.drop_type", SQLSTATE(42000) "DROP TYPE: access
denied for %s to schema '%s'", get_string_global_var(sql, "current_user"),
s->base.name);
if (!(t = schema_bind_type(sql, s, name)))
throw(SQL,"sql.drop_type", SQLSTATE(3F000) "DROP TYPE: type
'%s' does not exist", name);
if (!drop_action && mvc_check_dependency(sql, t->base.id,
TYPE_DEPENDENCY, NULL))
@@ -1643,7 +1643,7 @@ SQLrename_schema(Client cntxt, MalBlkPtr
if (!(s = mvc_bind_schema(sql, old_name)))
throw(SQL, "sql.rename_schema", SQLSTATE(42S02) "ALTER SCHEMA:
no such schema '%s'", old_name);
if (!mvc_schema_privs(sql, s))
- throw(SQL, "sql.rename_schema", SQLSTATE(42000) "ALTER SCHEMA:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), old_name);
+ throw(SQL, "sql.rename_schema", SQLSTATE(42000) "ALTER SCHEMA:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), old_name);
if (s->system)
throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA:
cannot rename a system schema");
if (!list_empty(s->tables.set) || !list_empty(s->types.set) ||
!list_empty(s->funcs.set) || !list_empty(s->seqs.set))
@@ -1679,7 +1679,7 @@ SQLrename_table(Client cntxt, MalBlkPtr
if (!(s = mvc_bind_schema(sql, oschema_name)))
throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER
TABLE: no such schema '%s'", oschema_name);
if (!mvc_schema_privs(sql, s))
- throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), oschema_name);
+ throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), oschema_name);
if (!(t = mvc_bind_table(sql, s, otable_name)))
throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER
TABLE: no such table '%s' in schema '%s'", otable_name, oschema_name);
if (t->system)
@@ -1703,7 +1703,7 @@ SQLrename_table(Client cntxt, MalBlkPtr
if (!(o = mvc_bind_schema(sql, oschema_name)))
throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER
TABLE: no such schema '%s'", oschema_name);
if (!mvc_schema_privs(sql, o))
- throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), oschema_name);
+ throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), oschema_name);
if (!(t = mvc_bind_table(sql, o, otable_name)))
throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER
TABLE: no such table '%s' in schema '%s'", otable_name, oschema_name);
if (t->system)
@@ -1721,7 +1721,7 @@ SQLrename_table(Client cntxt, MalBlkPtr
if (!(s = mvc_bind_schema(sql, nschema_name)))
throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER
TABLE: no such schema '%s'", nschema_name);
if (!mvc_schema_privs(sql, s))
- throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for '%s' to schema '%s'",
sqlvar_get_string(find_global_var(sql, mvc_bind_schema(sql, "sys"),
"current_user")), nschema_name);
+ throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER
TABLE: access denied for '%s' to schema '%s'", get_string_global_var(sql,
"current_user"), nschema_name);
if (isTempSchema(s))
throw(SQL, "sql.rename_table", SQLSTATE(3F000) "ALTER
TABLE: not possible to change table's schema to temporary");
if (mvc_bind_table(sql, s, otable_name))
@@ -1751,7 +1751,7 @@ SQLrename_column(Client cntxt, MalBlkPtr
if (!(s = mvc_bind_schema(sql, schema_name)))
throw(SQL, "sql.rename_column", SQLSTATE(42S02) "ALTER TABLE:
no such schema '%s'", schema_name);
if (!mvc_schema_privs(sql, s))
- throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE:
access denied for %s to schema '%s'", sqlvar_get_string(find_global_var(sql,
mvc_bind_schema(sql, "sys"), "current_user")), schema_name);
+ throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE:
access denied for %s to schema '%s'", get_string_global_var(sql,
"current_user"), schema_name);
if (!(t = mvc_bind_table(sql, s, table_name)))
throw(SQL, "sql.rename_column", SQLSTATE(42S02) "ALTER TABLE:
no such table '%s' in schema '%s'", table_name, schema_name);
if (t->system)
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -148,7 +148,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
str
getSQLoptimizer(mvc *m)
{
- char *opt = sqlvar_get_string(find_global_var(m, mvc_bind_schema(m,
"sys"), "optimizer"));
+ char *opt = get_string_global_var(m, "optimizer");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
