Changeset: d405221d083e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d405221d083e
Modified Files:
sql/server/rel_updates.c
Branch: Jul2012
Log Message:
COPY INTO: refer to *database* administrator rights in errors
"administrator rights" depends on the interpretation of the user, and
may for e.g. Windows users match the OS's user, instead of MonetDB's
user.
diffs (39 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
@@ -1083,7 +1083,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
a lock and only on tables without idx */
if (locked && sql->user_id != USER_MONETDB) {
return sql_error(sql, 02, "COPY INTO: insufficient privileges: "
- "COPY INTO from .. LOCKED requires administrator rights");
+ "COPY INTO from .. LOCKED requires database administrator
rights");
}
if (locked && (!list_empty(t->idxs.set) || !list_empty(t->keys.set))) {
return sql_error(sql, 02, "COPY INTO: insufficient privileges: "
@@ -1112,7 +1112,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
if (sql->user_id != USER_MONETDB)
return sql_error(sql, 02, "COPY INTO: insufficient
privileges: "
- "COPY INTO from file(s) requires
administrator rights, "
+ "COPY INTO from file(s) requires
database administrator rights, "
"use 'COPY INTO \"%s\" FROM STDIN'
instead", tname);
@@ -1163,7 +1163,7 @@ bincopyfrom(mvc *sql, dlist *qname, dlis
if (sql->user_id != USER_MONETDB) {
(void) sql_error(sql, 02, "COPY INTO: insufficient privileges: "
- "binary COPY INTO requires administrator
rights");
+ "binary COPY INTO requires database
administrator rights");
return NULL;
}
@@ -1261,7 +1261,7 @@ copyto(mvc *sql, symbol *sq, str filenam
struct stat fs;
if (sql->user_id != USER_MONETDB)
return sql_error(sql, 02, "COPY INTO: insufficient
privileges: "
- "COPY INTO file requires administrator
rights, "
+ "COPY INTO file requires database
administrator rights, "
"use 'COPY ... INTO STDOUT' instead");
if (filename && !MT_path_absolute(filename))
return sql_error(sql, 02, "COPY INTO: filename must "
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
