Changeset: 6497e9ab1fb3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6497e9ab1fb3
Modified Files:
sql/test/Users/Tests/test_privs2_p1.stable.out
sql/test/Users/Tests/test_privs2_p2.stable.err
sql/test/Users/Tests/test_privs2_p2.stable.out
sql/test/Users/privs2.sql
sql/test/Users/test_privs2.sql
Branch: indirect-privs
Log Message:
Approved output with indirect reference from views changes
diffs (191 lines):
diff --git a/sql/test/Users/Tests/test_privs2_p1.stable.out
b/sql/test/Users/Tests/test_privs2_p1.stable.out
--- a/sql/test/Users/Tests/test_privs2_p1.stable.out
+++ b/sql/test/Users/Tests/test_privs2_p1.stable.out
@@ -46,6 +46,8 @@ stdout of test 'test_privs2_p1` in direc
[ "test1", 1 ]
[ "test2", 2 ]
[ "test3", 3 ]
+#update version set i = 2 where i = 10;
+[ 0 ]
#SELECT updateversion('test1', 4);
% .%2 # table_name
% %2 # name
@@ -60,6 +62,8 @@ stdout of test 'test_privs2_p1` in direc
[ "test1", 4 ]
[ "test2", 2 ]
[ "test3", 3 ]
+#delete from version where i = 100;
+[ 0 ]
#SELECT deleteversion(4);
% .%2 # table_name
% %2 # name
@@ -74,6 +78,19 @@ stdout of test 'test_privs2_p1` in direc
[ "test1", 4 ]
[ "test2", 2 ]
[ "test3", 3 ]
+#truncate version;
+[ 3 ]
+#SELECT truncateversion();
+% .%2 # table_name
+% %2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT * FROM version;
+% my_schema.version, my_schema.version # table_name
+% name, i # name
+% varchar, int # type
+% 0, 1 # length
# 15:54:46 >
# 15:54:46 > "Done."
diff --git a/sql/test/Users/Tests/test_privs2_p2.stable.err
b/sql/test/Users/Tests/test_privs2_p2.stable.err
--- a/sql/test/Users/Tests/test_privs2_p2.stable.err
+++ b/sql/test/Users/Tests/test_privs2_p2.stable.err
@@ -36,27 +36,31 @@ MAPI = (my_user2) /var/tmp/mtest-28783/
QUERY = insert into version (name ,i) values ('test2' ,2) ;
ERROR = !INSERT INTO: insufficient privileges for user 'my_user2' to insert
into table 'version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = SELECT insertversion('test3', 3);
-ERROR = !INSERT INTO: insufficient privileges for user 'my_user2' to insert
into table 'version'
+MAPI = (my_user2) /var/tmp/mtest-28138/.s.monetdb.32010
+QUERY = SELECT * FROM version;
+ERROR = !SELECT: access denied for my_user2 to table 'my_schema.version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
+MAPI = (my_user2) /var/tmp/mtest-30947/.s.monetdb.39619
+QUERY = update version set i = 2 where i = 10;
+ERROR = !UPDATE: insufficient privileges for user 'my_user2' to update table
'version'
+CODE = 42000
+MAPI = (my_user2) /var/tmp/mtest-30947/.s.monetdb.39619
QUERY = SELECT * FROM version;
ERROR = !SELECT: access denied for my_user2 to table 'my_schema.version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = SELECT updateversion('test1', 4);
-ERROR = !UPDATE: insufficient privileges for user 'my_user2' to update table
'version'
+MAPI = (my_user2) /var/tmp/mtest-30947/.s.monetdb.39619
+QUERY = delete from version where i = 100;
+ERROR = !DELETE FROM: insufficient privileges for user 'my_user2' to delete
from table 'version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
+MAPI = (my_user2) /var/tmp/mtest-33129/.s.monetdb.30042
QUERY = SELECT * FROM version;
ERROR = !SELECT: access denied for my_user2 to table 'my_schema.version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
-QUERY = SELECT deleteversion(4);
-ERROR = !DELETE FROM: insufficient privileges for user 'my_user2' to delete
from table 'version'
+MAPI = (my_user2) /var/tmp/mtest-33129/.s.monetdb.30042
+QUERY = truncate version;
+ERROR = !TRUNCATE: insufficient privileges for user 'my_user2' to truncate
table 'version'
CODE = 42000
-MAPI = (my_user2) /var/tmp/mtest-28783/.s.monetdb.30417
+MAPI = (my_user2) /var/tmp/mtest-33129/.s.monetdb.30042
QUERY = SELECT * FROM version;
ERROR = !SELECT: access denied for my_user2 to table 'my_schema.version'
CODE = 42000
diff --git a/sql/test/Users/Tests/test_privs2_p2.stable.out
b/sql/test/Users/Tests/test_privs2_p2.stable.out
--- a/sql/test/Users/Tests/test_privs2_p2.stable.out
+++ b/sql/test/Users/Tests/test_privs2_p2.stable.out
@@ -5,19 +5,30 @@ stdout of test 'test_privs2_p2` in direc
# 15:54:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35594" "--set"
"mapi_usock=/var/tmp/mtest-15897/.s.monetdb.35594" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_Users"
"--set" "mal_listing=0"
# 15:54:46 >
-# MonetDB 5 server v11.15.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_Users', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 3.778 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:35594/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15897/.s.monetdb.35594
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
+#SELECT insertversion('test3', 3);
+% .%4 # table_name
+% %4 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT updateversion('test1', 4);
+% .%2 # table_name
+% %2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT deleteversion(4);
+% .%2 # table_name
+% %2 # name
+% int # type
+% 1 # length
+[ 1 ]
+#SELECT truncateversion();
+% .%2 # table_name
+% %2 # name
+% int # type
+% 1 # length
+[ 1 ]
# 15:54:47 >
diff --git a/sql/test/Users/privs2.sql b/sql/test/Users/privs2.sql
--- a/sql/test/Users/privs2.sql
+++ b/sql/test/Users/privs2.sql
@@ -62,16 +62,28 @@ begin
end;
+create function truncateversion() returns int
+begin
+
+ truncate version;
+
+ return 1;
+
+end;
+
-- grant right to my_user not to my_user2
GRANT SELECT on table version to my_user;
GRANT INSERT on table version to my_user;
GRANT UPDATE on table version to my_user;
GRANT DELETE on table version to my_user;
+GRANT TRUNCATE on table version to my_user;
GRANT EXECUTE on function insertversion to my_user;
GRANT EXECUTE on function updateversion to my_user;
GRANT EXECUTE on function deleteversion to my_user;
+GRANT EXECUTE on function truncateversion to my_user;
GRANT EXECUTE on function insertversion to my_user2;
GRANT EXECUTE on function updateversion to my_user2;
GRANT EXECUTE on function deleteversion to my_user2;
+GRANT EXECUTE on function truncateversion to my_user2;
diff --git a/sql/test/Users/test_privs2.sql b/sql/test/Users/test_privs2.sql
--- a/sql/test/Users/test_privs2.sql
+++ b/sql/test/Users/test_privs2.sql
@@ -6,10 +6,20 @@ SELECT insertversion('test3', 3);
SELECT * FROM version;
+update version set i = 2 where i = 10;
+
SELECT updateversion('test1', 4);
SELECT * FROM version;
+delete from version where i = 100;
+
SELECT deleteversion(4);
SELECT * FROM version;
+
+truncate version;
+
+SELECT truncateversion();
+
+SELECT * FROM version;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
