Changeset: 5d45d13e0770 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d45d13e0770
Modified Files:
sql/test/Users/Tests/All
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
sql/test/Users/Tests/grantMonetdb.SQL.py
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.out
Branch: default
Log Message:
Some (output) corrections.
diffs (truncated from 399 to 300 lines):
diff --git a/sql/test/Users/Tests/All b/sql/test/Users/Tests/All
--- a/sql/test/Users/Tests/All
+++ b/sql/test/Users/Tests/All
@@ -1,3 +1,4 @@
+dropManyUsers.Bug-3764
schema
role1
role2
@@ -20,6 +21,6 @@ grantAndRevokeUserLogedIN.Bug-3476
grantRevokeAndGrantAgain.Bug-3765
grantMonetdbToRegularUser.Bug-3771
grantMonetdbToSchemaOwner.Bug-3771
+grantPrivilegesNonDefaultRole.Bug-3365
grantRole.Bug-3772
grantMonetdb
-dropManyUsers.Bug-3764
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'dropManyUsers` in directory 'sql/test/Users` itself:
+stderr of test 'dropManyUsers.Bug-3764` in directory 'sql/test/Users` itself:
# 14:28:36 >
@@ -28,14 +28,7 @@ stderr of test 'dropManyUsers` in direct
+# 14:49:14 >
+# 14:49:14 > "Done."
+# 14:49:14 >
-
-MAPI = (monetdb) /var/tmp/mtest-23837/.s.monetdb.35821
-ACTION= mapi_query_done
-QUERY = DROP USER user4;
-
-
-# 14:34:37 >
-# 14:34:37 > "Done."
-# 14:34:37 >
-
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'dropManyUsers` in directory 'sql/test/Users` itself:
+stdout of test 'dropManyUsers.Bug-3764` in directory 'sql/test/Users` itself:
# 14:28:36 >
@@ -75,10 +75,10 @@ Ready.
% varchar, varchar, int # type
% 7, 13, 4 # length
[ "monetdb", "MonetDB Admin", 2000 ]
-[ "user1", "1st user", 6992 ]
-[ "user2", "2nd user", 6992 ]
-[ "user3", "3rd user", 6992 ]
-[ "user4", "4th user", 6992 ]
+[ "user1", "1st user", 6995 ]
+[ "user2", "2nd user", 6995 ]
+[ "user3", "3rd user", 6995 ]
+[ "user4", "4th user", 6995 ]
#DROP USER user1;
#DROP USER user2;
#DROP USER user3;
diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
--- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
+++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'grantAndRevokeUserLogedIN` in directory 'sql/test/Users`
itself:
+stderr of test 'grantAndRevokeUserLogedIN.Bug-3476` in directory
'sql/test/Users` itself:
# 10:42:58 >
@@ -31,17 +31,17 @@ stderr of test 'grantAndRevokeUserLogedI
# 10:42:59 >
Traceback (most recent call last):
- File "grantAndRevokeUserLogedIN.SQL.py", line 39, in <module>
+ File "grantAndRevokeUserLogedIN.Bug-3476.SQL.py", line 54, in <module>
run(c2, 'UPDATE test SET x = -66 WHERE y = 66')
- File "grantAndRevokeUserLogedIN.SQL.py", line 26, in run
+ File "grantAndRevokeUserLogedIN.Bug-3476.SQL.py", line 26, in run
r = conn.execute(sql)
- File
"/home/vera/Desktop/MonetDB/installation/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 127, in execute
+ File
"/home/vera/Desktop/MonetDB/BUILD/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 127, in execute
return self.command('s' + query + '\n;')
- File
"/home/vera/Desktop/MonetDB/installation/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 132, in command
+ File
"/home/vera/Desktop/MonetDB/BUILD/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 132, in command
return self.mapi.cmd(command)
- File
"/home/vera/Desktop/MonetDB/installation/lib/python2.7/site-packages/monetdb/mapi.py",
line 178, in cmd
+ File
"/home/vera/Desktop/MonetDB/BUILD/lib/python2.7/site-packages/monetdb/mapi.py",
line 178, in cmd
raise OperationalError(response[1:])
-monetdb.exceptions.OperationalError: UPDATE: insufficient privileges for user
'new_user' to update table 'test' on column 'x'
+monetdb.exceptions.OperationalError: UPDATE: insufficient privileges for user
'new_user' to update table 'test'
# 10:42:59 >
diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
--- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
+++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'grantAndRevokeUserLogedIN` in directory 'sql/test/Users`
itself:
+stdout of test 'grantAndRevokeUserLogedIN.Bug-3476` in directory
'sql/test/Users` itself:
# 10:44:33 >
diff --git a/sql/test/Users/Tests/grantMonetdb.SQL.py
b/sql/test/Users/Tests/grantMonetdb.SQL.py
--- a/sql/test/Users/Tests/grantMonetdb.SQL.py
+++ b/sql/test/Users/Tests/grantMonetdb.SQL.py
@@ -1,6 +1,6 @@
###
-# Assess that the admin can change the password of a user.
-# Assess that a user can change its own password.
+# Grant monetdb rights to a user.
+# Verify that the user can assume the monetdb role and CREATE new users, GRANT
privileges and roles.
###
from util import sql_test_client
diff --git a/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
b/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
--- a/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
+++ b/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.SQL.py
@@ -30,13 +30,12 @@ GRANT SELECT on table schemaTest.testTab
""")
sql_test_client('user_delete', 'delete', input = """\
--- Check delete.
-DELETE FROM testTable where v1 = 2;
+DELETE FROM testTable where v1 = 2; -- should work
-- Check all the other privileges (they should fail).
-SELECT * FROM testTable;
-UPDATE testTable set v1 = 2 where v2 = 7;
-INSERT into testTable values (3, 3);
+SELECT * FROM testTable; -- not enough privileges
+UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
+INSERT into testTable values (3, 3); -- not enough privileges
""")
sql_test_client('user_update', 'update', input = """\
@@ -44,9 +43,9 @@ sql_test_client('user_update', 'update',
UPDATE testTable set v1 = 2 where v2 = 7;
-- Check all the other privileges (they should fail).
-SELECT * FROM testTable;
-INSERT into testTable values (3, 3);
-DELETE FROM testTable where v1 = 2;
+SELECT * FROM testTable; -- not enough privileges
+INSERT into testTable values (3, 3); -- not enough privileges
+DELETE FROM testTable where v1 = 2; -- not enough privileges
""")
sql_test_client('user_insert', 'insert', input = """\
@@ -54,9 +53,9 @@ sql_test_client('user_insert', 'insert',
INSERT into testTable values (3, 3);
-- Check all the other privileges (they should fail).
-SELECT * FROM testTable;
-UPDATE testTable set v1 = 2 where v2 = 7;
-DELETE FROM testTable where v1 = 2;
+SELECT * FROM testTable; -- not enough privileges
+UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
+DELETE FROM testTable where v1 = 2; -- not enough privileges
""")
sql_test_client('user_select', 'select', input = """\
@@ -64,9 +63,9 @@ sql_test_client('user_select', 'select',
SELECT * FROM testTable;
-- Check all the other privileges (they should fail).
-INSERT into testTable values (3, 3);
-UPDATE testTable set v1 = 2 where v2 = 7;
-DELETE FROM testTable where v1 = 2;
+INSERT into testTable values (3, 3); -- not enough privileges
+UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
+DELETE FROM testTable where v1 = 2; -- not enough privileges
""")
sql_test_client('monetdb', 'monetdb', input = """\
@@ -80,19 +79,19 @@ REVOKE SELECT on schemaTest.testTable fr
# Next four transitions should not be allowed.
sql_test_client('user_delete', 'delete', input = """\
-DELETE from testTable where v2 = 666;
+DELETE from testTable where v2 = 666; -- not enough privileges
""")
sql_test_client('user_insert', 'insert', input = """\
-INSERT into testTable values (666, 666);
+INSERT into testTable values (666, 666); -- not enough privileges
""")
sql_test_client('user_update', 'update', input = """\
-UPDATE testTable set v1 = 666 where v2 = 666;
+UPDATE testTable set v1 = 666 where v2 = 666; -- not enough privileges
""")
sql_test_client('user_select', 'select', input = """\
-SELECT * FROM testTable where v1 = 666;
+SELECT * FROM testTable where v1 = 666; -- not enough privileges
""")
#
@@ -109,17 +108,17 @@ GRANT SELECT on table schemaTest.testTab
# Next four transitions should be allowed.
sql_test_client('user_delete', 'delete', input = """\
-DELETE from testTable where v1 = 42;
+DELETE from testTable where v1 = 42; -- privilege granted
""")
sql_test_client('user_insert', 'insert', input = """\
-INSERT into testTable values (42, 42);
+INSERT into testTable values (42, 42); -- privilege granted
""")
sql_test_client('user_update', 'update', input = """\
-UPDATE testTable set v1 = 42 where v2 = 42;
+UPDATE testTable set v1 = 42 where v2 = 42; -- privilege granted
""")
sql_test_client('user_select', 'select', input = """\
-SELECT * FROM testTable where v1 = 42;
+SELECT * FROM testTable where v1 = 42; -- privilege granted
""")
diff --git a/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
b/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
--- a/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
+++ b/sql/test/Users/Tests/grantRevokeAndGrantAgain.Bug-3765.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'grantRevokeAndGrantAgain` in directory 'sql/test/Users` itself:
+stderr of test 'grantRevokeAndGrantAgain.Bug-3765` in directory
'sql/test/Users` itself:
# 10:09:32 >
@@ -30,56 +30,59 @@ stderr of test 'grantRevokeAndGrantAgain
# 10:09:33 > "/usr/bin/python2" "grantRevokeAndGrantAgain.SQL.py"
"grantRevokeAndGrantAgain"
# 10:09:33 >
-MAPI = (user_delete) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = SELECT * FROM testTable;
+MAPI = (user_delete) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = SELECT * FROM testTable; -- not enough privileges
ERROR = !SELECT: access denied for user_delete to table 'schematest.testtable'
-MAPI = (user_delete) /var/tmp/mtest-18691/.s.monetdb.35979
+MAPI = (user_delete) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
+ERROR = !UPDATE: insufficient privileges for user 'user_delete' to update
table 'testtable'
+MAPI = (user_delete) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = INSERT into testTable values (3, 3); -- not enough privileges
+ERROR = !INSERT INTO: insufficient privileges for user 'user_delete' to insert
into table 'testtable'
+MAPI = (user_update) /var/tmp/mtest-23132/.s.monetdb.35725
QUERY = UPDATE testTable set v1 = 2 where v2 = 7;
-ERROR = !UPDATE: insufficient privileges for user 'user_delete' to update
table 'testtable' on column 'v1'
-MAPI = (user_delete) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = INSERT into testTable values (3, 3);
-ERROR = !INSERT INTO: insufficient privileges for user 'user_delete' to insert
into table 'testtable'
-MAPI = (user_update) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = SELECT * FROM testTable;
+ERROR = !UPDATE: insufficient privileges for user 'user_update' to update
table 'testtable'
+MAPI = (user_update) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = SELECT * FROM testTable; -- not enough privileges
ERROR = !SELECT: access denied for user_update to table 'schematest.testtable'
-MAPI = (user_update) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = INSERT into testTable values (3, 3);
+MAPI = (user_update) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = INSERT into testTable values (3, 3); -- not enough privileges
ERROR = !INSERT INTO: insufficient privileges for user 'user_update' to insert
into table 'testtable'
-MAPI = (user_update) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = DELETE FROM testTable where v1 = 2;
+MAPI = (user_update) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = DELETE FROM testTable where v1 = 2; -- not enough privileges
ERROR = !DELETE FROM: insufficient privileges for user 'user_update' to delete
from table 'testtable'
-MAPI = (user_insert) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = SELECT * FROM testTable;
+MAPI = (user_insert) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = SELECT * FROM testTable; -- not enough privileges
ERROR = !SELECT: access denied for user_insert to table 'schematest.testtable'
-MAPI = (user_insert) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = UPDATE testTable set v1 = 2 where v2 = 7;
-ERROR = !UPDATE: insufficient privileges for user 'user_insert' to update
table 'testtable' on column 'v1'
-MAPI = (user_insert) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = DELETE FROM testTable where v1 = 2;
+MAPI = (user_insert) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
+ERROR = !UPDATE: insufficient privileges for user 'user_insert' to update
table 'testtable'
+MAPI = (user_insert) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = DELETE FROM testTable where v1 = 2; -- not enough privileges
ERROR = !DELETE FROM: insufficient privileges for user 'user_insert' to delete
from table 'testtable'
-MAPI = (user_select) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = INSERT into testTable values (3, 3);
+MAPI = (user_select) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = INSERT into testTable values (3, 3); -- not enough privileges
ERROR = !INSERT INTO: insufficient privileges for user 'user_select' to insert
into table 'testtable'
-MAPI = (user_select) /var/tmp/mtest-18691/.s.monetdb.35979
-QUERY = UPDATE testTable set v1 = 2 where v2 = 7;
+MAPI = (user_select) /var/tmp/mtest-23132/.s.monetdb.35725
+QUERY = UPDATE testTable set v1 = 2 where v2 = 7; -- not enough privileges
ERROR = !UPDATE: insufficient privileges for user 'user_select' to update
table 'testtable' on column 'v1'
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
