Changeset: 1f9033522773 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f9033522773
Removed Files:
sql/test/Users/Tests/role1.reqtests
sql/test/Users/Tests/role1.stable.err
sql/test/Users/Tests/role1.stable.out
sql/test/Users/Tests/role2.SQL.py
sql/test/Users/Tests/role2.reqtests
sql/test/Users/Tests/role2.stable.err
sql/test/Users/Tests/role2.stable.out
Modified Files:
sql/test/Users/Tests/All
sql/test/Users/Tests/role1.SQL.py
Branch: default
Log Message:
Merged "role1" and "role2" into "role1", and removed its dependency on the test
"schema"
diffs (271 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,6 +1,5 @@
+role1
schema
-role1
-role2
table
unknown_user
privs
@@ -22,4 +21,4 @@ schemaRights
metadataConsistency
sessioncontrol
createUserRollback
-HAVE_PYMONETDB?userCallFunction
+userCallFunction
diff --git a/sql/test/Users/Tests/role1.SQL.py
b/sql/test/Users/Tests/role1.SQL.py
--- a/sql/test/Users/Tests/role1.SQL.py
+++ b/sql/test/Users/Tests/role1.SQL.py
@@ -1,5 +1,6 @@
###
# SET a GRANTed ROLE for a USER (possible).
+# SET a non-GRANTed ROLE for a USER (not possible).
###
import os, sys
@@ -8,11 +9,34 @@ import pymonetdb
db=os.getenv("TSTDB")
port=int(os.getenv("MAPIPORT"))
+mdbconn = pymonetdb.connect(database=db, port=port, autocommit=True,
user='monetdb', password='monetdb')
+mdb = mdbconn.cursor()
+mdb.execute("CREATE ROLE my_role")
+mdb.execute("CREATE SCHEMA my_schema AUTHORIZATION my_role")
+mdb.execute("CREATE USER my_user with password 'p1' name 'User with role'
schema my_schema")
+mdb.execute("GRANT my_role to my_user")
+mdb.execute("CREATE USER my_user2 with password 'p2' name 'User without role'
schema my_schema")
+
client = pymonetdb.connect(database=db, port=port, autocommit=True,
user='my_user', password='p1')
cursor = client.cursor()
-
# exceptions will output
cursor.execute("SET ROLE my_role")
-
cursor.close()
client.close()
+
+client = pymonetdb.connect(database=db, port=port, autocommit=True,
user='my_user2', password='p2')
+cursor = client.cursor()
+# exception "!Role (my_role) missing" is expected
+try:
+ cursor.execute("SET ROLE my_role")
+except:
+ pass
+cursor.close()
+client.close()
+
+mdb.execute("DROP USER my_user")
+mdb.execute("DROP USER my_user2")
+mdb.execute("DROP ROLE my_role")
+mdb.execute("DROP SCHEMA my_schema")
+mdb.close()
+mdbconn.close()
diff --git a/sql/test/Users/Tests/role1.reqtests
b/sql/test/Users/Tests/role1.reqtests
deleted file mode 100644
--- a/sql/test/Users/Tests/role1.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-schema
diff --git a/sql/test/Users/Tests/role1.stable.err
b/sql/test/Users/Tests/role1.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/role1.stable.err
+++ /dev/null
@@ -1,17 +0,0 @@
-stderr of test 'role1` in directory 'sql/test/Users` itself:
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=37763 --set xrpc_port=45703 --set monet_prompt= --trace
"--dbname=mTests_src_test_Users" --dbinit=" module(sql_server);" ; echo ; echo
Over..
-# 15:30:50 >
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 60 ./role1.SQL role1
-# 15:30:50 >
-
-
-# 15:42:19 >
-# 15:42:19 > Done.
-# 15:42:19 >
-
diff --git a/sql/test/Users/Tests/role1.stable.out
b/sql/test/Users/Tests/role1.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/role1.stable.out
+++ /dev/null
@@ -1,24 +0,0 @@
-stdout of test 'role1` in directory 'sql/test/Users` itself:
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=37763 --set xrpc_port=45703 --set monet_prompt= --trace
"--dbname=mTests_src_test_Users" --dbinit=" module(sql_server);" ; echo ; echo
Over..
-# 15:30:50 >
-
-# Monet Database Server V4.16.2
-# Copyright (c) 1993-2007, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
-
-
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 60 ./role1.SQL role1
-# 15:30:50 >
-
-
-# 15:30:50 >
-# 15:30:50 > Done.
-# 15:30:50 >
-
diff --git a/sql/test/Users/Tests/role2.SQL.py
b/sql/test/Users/Tests/role2.SQL.py
deleted file mode 100644
--- a/sql/test/Users/Tests/role2.SQL.py
+++ /dev/null
@@ -1,24 +0,0 @@
-###
-# SET a non-GRANTed ROLE for a USER (not possible).
-###
-import os, sys
-import pymonetdb
-
-db=os.getenv("TSTDB")
-port=int(os.getenv("MAPIPORT"))
-client = pymonetdb.connect(database=db, port=port, autocommit=True,
user='my_user2', password='p2')
-cursor = client.cursor()
-
-# exceptions will output
-error = False
-try:
- cursor.execute("SET ROLE my_role")
-except:
- error = True
- pass
-
-if not error:
- print("should have received an exception: !Role (my_role) missing")
-
-cursor.close()
-client.close()
diff --git a/sql/test/Users/Tests/role2.reqtests
b/sql/test/Users/Tests/role2.reqtests
deleted file mode 100644
--- a/sql/test/Users/Tests/role2.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-schema
diff --git a/sql/test/Users/Tests/role2.stable.err
b/sql/test/Users/Tests/role2.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/role2.stable.err
+++ /dev/null
@@ -1,81 +0,0 @@
-stderr of test 'role2` in directory 'sql/test/Users` itself:
-
-
-# 20:38:25 >
-# 20:38:25 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=4 --set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=31333 --set
xrpc_port=43851 --set monet_prompt= --trace "--dbname=mTests_src_test_Users"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 20:38:25 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.27.0
-# builtin opt monet_pid = 9912
-# builtin opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config =
/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 4
-# cmdline opt monet_mod_path =
/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 31333
-# cmdline opt xrpc_port = 43851
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_Users
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf)
-
-# 17:42:31 >
-# 17:42:31 > "Done."
-# 17:42:31 >
-
diff --git a/sql/test/Users/Tests/role2.stable.out
b/sql/test/Users/Tests/role2.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/role2.stable.out
+++ /dev/null
@@ -1,24 +0,0 @@
-stdout of test 'role2` in directory 'sql/test/Users` itself:
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm"
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=37763 --set xrpc_port=45703 --set monet_prompt= --trace
"--dbname=mTests_src_test_Users" --dbinit=" module(sql_server);" ; echo ; echo
Over..
-# 15:30:50 >
-
-# Monet Database Server V4.16.2
-# Copyright (c) 1993-2007, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
-
-
-
-
-# 15:30:50 >
-# 15:30:50 > Mtimeout -timeout 60 ./role2.SQL role2
-# 15:30:50 >
-
-
-# 15:30:50 >
-# 15:30:50 > Done.
-# 15:30:50 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
