Changeset: 39d47e39fd49 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39d47e39fd49
Added Files:
sql/test/Users/Tests/createSetUp.sql
sql/test/Users/Tests/privs.sql
sql/test/Users/Tests/privs2.sql
Removed Files:
sql/test/Users/Tests/createSetUp.sql.src
sql/test/Users/Tests/createSetUp.stable.err
sql/test/Users/Tests/createSetUp.stable.out
sql/test/Users/Tests/privs.sql.src
sql/test/Users/Tests/privs.stable.err
sql/test/Users/Tests/privs.stable.out
sql/test/Users/Tests/privs2.sql.src
sql/test/Users/Tests/privs2.stable.err
sql/test/Users/Tests/privs2.stable.out
sql/test/Users/Tests/test_privs2_p1.stable.err
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/Tests/test_privs_p1.stable.err
sql/test/Users/Tests/test_privs_p1.stable.out
sql/test/Users/Tests/test_privs_p2.stable.err
sql/test/Users/Tests/test_privs_p2.stable.out
sql/test/Users/createSetUp.sql
sql/test/Users/privs.sql
sql/test/Users/privs2.sql
sql/test/Users/table.sql
sql/test/Users/test_privs.sql
sql/test/Users/test_privs2.sql
Modified Files:
sql/test/Users/Tests/createSetUp.test
sql/test/Users/Tests/privs2.test
Branch: default
Log Message:
More clean up
- replaced the unnecessary .src files with just the .sql contents
- removed stable.{err,out}
diffs (truncated from 936 to 300 lines):
diff --git a/sql/test/Users/Tests/createSetUp.sql.src
b/sql/test/Users/Tests/createSetUp.sql
rename from sql/test/Users/Tests/createSetUp.sql.src
rename to sql/test/Users/Tests/createSetUp.sql
--- a/sql/test/Users/Tests/createSetUp.sql.src
+++ b/sql/test/Users/Tests/createSetUp.sql
@@ -1,1 +1,14 @@
-$RELSRCDIR/../createSetUp.sql
+CREATE SCHEMA library;
+CREATE TABLE library.orders(price int, name VARCHAR(100));
+
+CREATE ROLE bankAdmin;
+CREATE SCHEMA bank AUTHORIZATION bankAdmin;
+CREATE TABLE bank.accounts(nr int, name VARCHAR(100));
+CREATE TABLE bank.loans(nr int, amount int);
+
+CREATE USER alice WITH PASSWORD 'alice' name 'alice' schema library;
+CREATE USER april WITH PASSWORD 'april' name 'april' schema bank;
+
+GRANT ALL ON bank.accounts to april;
+GRANT bankAdmin to april;
+
diff --git a/sql/test/Users/Tests/createSetUp.stable.err
b/sql/test/Users/Tests/createSetUp.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/createSetUp.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'createSetUp` in directory 'sql/test/Users` itself:
-
-
-# 23:01:30 >
-# 23:01:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36242" "--set"
"mapi_usock=/var/tmp/mtest-7070/.s.monetdb.36242" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/vera/Desktop/MonetDB/BUILD/var/MonetDB/mTests_sql_test_Users"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 23:01:30 >
-
-# builtin opt gdk_dbpath =
/home/vera/Desktop/MonetDB/BUILD/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36242
-# cmdline opt mapi_usock = /var/tmp/mtest-7070/.s.monetdb.36242
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/home/vera/Desktop/MonetDB/BUILD/var/MonetDB/mTests_sql_test_Users
-# cmdline opt mal_listing = 0
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 23:01:31 >
-# 23:01:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7070" "--port=36242"
-# 23:01:31 >
-
-
-# 23:01:31 >
-# 23:01:31 > "Done."
-# 23:01:31 >
-
diff --git a/sql/test/Users/Tests/createSetUp.stable.out
b/sql/test/Users/Tests/createSetUp.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/createSetUp.stable.out
+++ /dev/null
@@ -1,45 +0,0 @@
-stdout of test 'createSetUp` in directory 'sql/test/Users` itself:
-
-
-# 23:01:30 >
-# 23:01:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36242" "--set"
"mapi_usock=/var/tmp/mtest-7070/.s.monetdb.36242" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/vera/Desktop/MonetDB/BUILD/var/MonetDB/mTests_sql_test_Users"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 23:01:30 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_Users', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 3.746 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://buzu:36242/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7070/.s.monetdb.36242
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.9'
-# Finished reading the write-ahead log 'sql_logs/sql/log.9'
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-
-# 23:01:31 >
-# 23:01:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7070" "--port=36242"
-# 23:01:31 >
-
-#CREATE SCHEMA library;
-#CREATE ROLE libraryWorker;
-#CREATE TABLE library.orders(price int, name VARCHAR(100));
-#CREATE ROLE bankAdmin;
-#CREATE SCHEMA bank AUTHORIZATION bankAdmin;
-#CREATE TABLE bank.accounts(nr int, name VARCHAR(100));
-#CREATE TABLE bank.loans(nr int, amount int);
-#CREATE USER alice WITH PASSWORD 'alice' name 'alice' schema library;
-#CREATE USER april WITH PASSWORD 'april' name 'april' schema bank;
-#GRANT ALL ON bank.accounts to april;
-#GRANT bankAdmin to april;
-
-# 23:01:31 >
-# 23:01:31 > "Done."
-# 23:01:31 >
-
diff --git a/sql/test/Users/Tests/createSetUp.test
b/sql/test/Users/Tests/createSetUp.test
--- a/sql/test/Users/Tests/createSetUp.test
+++ b/sql/test/Users/Tests/createSetUp.test
@@ -2,9 +2,6 @@ statement ok
CREATE SCHEMA library
statement ok
-CREATE ROLE libraryWorker
-
-statement ok
CREATE TABLE library.orders(price int, name VARCHAR(100))
statement ok
diff --git a/sql/test/Users/Tests/privs.sql.src b/sql/test/Users/Tests/privs.sql
rename from sql/test/Users/Tests/privs.sql.src
rename to sql/test/Users/Tests/privs.sql
--- a/sql/test/Users/Tests/privs.sql.src
+++ b/sql/test/Users/Tests/privs.sql
@@ -1,1 +1,9 @@
-$RELSRCDIR/../privs.sql
+set schema "my_schema";
+
+CREATE table test (i int, b bigint);
+
+-- grant right to my_user not to my_user2
+GRANT SELECT on table test to my_user;
+GRANT INSERT on table test to my_user;
+GRANT UPDATE on table test to my_user;
+GRANT DELETE on table test to my_user;
diff --git a/sql/test/Users/Tests/privs.stable.err
b/sql/test/Users/Tests/privs.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/privs.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'privs` in directory 'sql/test/Users` itself:
-
-
-# 13:33:49 >
-# 13:33:49 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36407" "--set"
"mapi_usock=/var/tmp/mtest-14454/.s.monetdb.36407" "--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"
-# 13:33:49 >
-
-# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 36407
-# cmdline opt mapi_usock = /var/tmp/mtest-14454/.s.monetdb.36407
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_Users
-# cmdline opt mal_listing = 0
-
-# 13:33:49 >
-# 13:33:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14454" "--port=36407"
-# 13:33:49 >
-
-
-# 13:33:49 >
-# 13:33:49 > "Done."
-# 13:33:49 >
-
diff --git a/sql/test/Users/Tests/privs.stable.out
b/sql/test/Users/Tests/privs.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/privs.stable.out
+++ /dev/null
@@ -1,37 +0,0 @@
-stdout of test 'privs` in directory 'sql/test/Users` itself:
-
-
-# 13:33:49 >
-# 13:33:49 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36407" "--set"
"mapi_usock=/var/tmp/mtest-14454/.s.monetdb.36407" "--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"
-# 13:33:49 >
-
-# 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:36407/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14454/.s.monetdb.36407
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-
-# 13:33:49 >
-# 13:33:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14454" "--port=36407"
-# 13:33:49 >
-
-#set schema "my_schema";
-#CREATE table test (i int, b bigint);
-#GRANT SELECT on table test to my_user;
-#GRANT INSERT on table test to my_user;
-#GRANT UPDATE on table test to my_user;
-#GRANT DELETE on table test to my_user;
-
-# 13:33:49 >
-# 13:33:49 > "Done."
-# 13:33:49 >
-
diff --git a/sql/test/Users/Tests/privs2.sql.src
b/sql/test/Users/Tests/privs2.sql
rename from sql/test/Users/Tests/privs2.sql.src
rename to sql/test/Users/Tests/privs2.sql
--- a/sql/test/Users/Tests/privs2.sql.src
+++ b/sql/test/Users/Tests/privs2.sql
@@ -1,1 +1,37 @@
-$RELSRCDIR/../privs2.sql
+set schema "my_schema";
+
+create table version (name varchar(10), i int);
+
+insert into version (name, i) values ('test1', 1);
+
+create function insertversion(iname varchar(10), ii int) returns int
+begin
+ insert into version (name, i) values (iname, ii);
+ return 1;
+end;
+
+create function updateversion(iname varchar(10), ii int) returns int
+begin
+ update version set i = ii where name = iname;
+ return 1;
+end;
+
+create function deleteversion(iname varchar(10)) returns int
+begin
+ delete from version where name = iname;
+ 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 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 insertversion to my_user2;
+GRANT EXECUTE on function updateversion to my_user2;
+GRANT EXECUTE on function deleteversion to my_user2;
diff --git a/sql/test/Users/Tests/privs2.stable.err
b/sql/test/Users/Tests/privs2.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/privs2.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'privs2` in directory 'sql/test/Users` itself:
-
-
-# 15:54:45 >
-# 15:54:45 > "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:45 >
-
-# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35594
-# cmdline opt mapi_usock = /var/tmp/mtest-15897/.s.monetdb.35594
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_Users
-# cmdline opt mal_listing = 0
-
-# 15:54:45 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
