Changeset: 129d25dc2e5d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/129d25dc2e5d
Added Files:
sql/test/BugTracker/Tests/authorization.SF-1430616-1.test
sql/test/BugTracker/Tests/authorization.SF-1430616-2.reqtests
sql/test/BugTracker/Tests/authorization.SF-1430616-2.test
sql/test/BugTracker/Tests/authorization.SF-1430616-3.reqtests
sql/test/BugTracker/Tests/authorization.SF-1430616-3.test
sql/test/BugTracker/Tests/auto_commit.SF-1724151.test
sql/test/Skyserver/Tests/Skyserver_constraints.reqtests
sql/test/Skyserver/Tests/Skyserver_constraints.test
sql/test/Skyserver/Tests/Skyserver_constraints_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_constraints_v6.test
sql/test/Skyserver/Tests/Skyserver_dropConstraints.reqtests
sql/test/Skyserver/Tests/Skyserver_dropConstraints.test
sql/test/Skyserver/Tests/Skyserver_dropConstraints_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_dropConstraints_v6.test
sql/test/Skyserver/Tests/Skyserver_dropFunctions.reqtests
sql/test/Skyserver/Tests/Skyserver_dropFunctions.test
sql/test/Skyserver/Tests/Skyserver_dropFunctions_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_dropFunctions_v6.test
sql/test/Skyserver/Tests/Skyserver_dropTables.reqtests
sql/test/Skyserver/Tests/Skyserver_dropTables.test
sql/test/Skyserver/Tests/Skyserver_dropTables_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_dropTables_v6.test
sql/test/Skyserver/Tests/Skyserver_dropViews.reqtests
sql/test/Skyserver/Tests/Skyserver_dropViews.test
sql/test/Skyserver/Tests/Skyserver_dropViews_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_dropViews_v6.test
sql/test/Skyserver/Tests/Skyserver_functions.reqtests
sql/test/Skyserver/Tests/Skyserver_functions.test
sql/test/Skyserver/Tests/Skyserver_functions_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_functions_v6.test
sql/test/Skyserver/Tests/Skyserver_import.reqtests
sql/test/Skyserver/Tests/Skyserver_import.test.in
sql/test/Skyserver/Tests/Skyserver_import_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_import_v6.test.in
sql/test/Skyserver/Tests/Skyserver_tables.reqtests
sql/test/Skyserver/Tests/Skyserver_tables.test
sql/test/Skyserver/Tests/Skyserver_tables_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_tables_v6.test
sql/test/Skyserver/Tests/Skyserver_views.reqtests
sql/test/Skyserver/Tests/Skyserver_views.test
sql/test/Skyserver/Tests/Skyserver_views_v6.reqtests
sql/test/Skyserver/Tests/Skyserver_views_v6.test
sql/test/Skyserver/Tests/create_user.test
sql/test/Skyserver/Tests/create_user_v6.test
sql/test/Skyserver/Tests/drop_user.reqtests
sql/test/Skyserver/Tests/drop_user.test
sql/test/Skyserver/Tests/drop_user_v6.reqtests
sql/test/Skyserver/Tests/drop_user_v6.test
sql/test/Triggers/Tests/trigger_owner-1.test
sql/test/Triggers/Tests/trigger_owner-2.reqtests
sql/test/Triggers/Tests/trigger_owner-2.test
sql/test/Triggers/Tests/trigger_owner-3.reqtests
sql/test/Triggers/Tests/trigger_owner-3.test
Removed Files:
sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.py
sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver.timeout
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.timeout
sql/test/Triggers/Tests/trigger_owner.SQL.py
Modified Files:
sql/test/BugTracker/Tests/All
sql/test/Skyserver/Tests/All
sql/test/Triggers/Tests/All
Branch: Jan2022
Log Message:
Converted tests.
diffs (truncated from 15710 to 300 lines):
diff --git a/sql/test/BugTracker/Tests/All b/sql/test/BugTracker/Tests/All
--- a/sql/test/BugTracker/Tests/All
+++ b/sql/test/BugTracker/Tests/All
@@ -14,10 +14,11 @@ intersect_in_subquery.SF-1339411
rows_affected.SF-1377180
broken_join.SF-1373391
insert_not_exists.SF-1380287
-authorization.SF-1430616
+authorization.SF-1430616-1
+USER=voc&PASSWD=voc?authorization.SF-1430616-2
+authorization.SF-1430616-3
mapi_connect_errors_vanish.SF-1432134
create_column_name_data.SF-1440214
-connect_crash.SF-1436626
drop_schema_crash.SF-1504794
set_session_vars.SF-1505987
reset_session_vars.SF-1505987
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616-1.test
b/sql/test/BugTracker/Tests/authorization.SF-1430616-1.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616-1.test
@@ -0,0 +1,29 @@
+statement ok
+CREATE USER voc WITH PASSWORD 'voc' NAME 'VOC Explorer' SCHEMA sys
+
+query TTT rowsort
+SELECT users.name, users.fullname, schemas.name as schema
+FROM users, schemas
+WHERE users.default_schema = schemas.id
+AND users.name = 'voc'
+----
+voc
+VOC Explorer
+sys
+
+statement ok
+CREATE SCHEMA voc AUTHORIZATION voc
+
+statement ok
+ALTER USER voc SET SCHEMA voc
+
+query TTT rowsort
+SELECT users.name, users.fullname, schemas.name as schema
+FROM users, schemas
+WHERE users.default_schema = schemas.id
+AND users.name = 'voc'
+----
+voc
+VOC Explorer
+voc
+
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616-2.reqtests
b/sql/test/BugTracker/Tests/authorization.SF-1430616-2.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616-2.reqtests
@@ -0,0 +1,1 @@
+authorization.SF-1430616-1
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616-2.test
b/sql/test/BugTracker/Tests/authorization.SF-1430616-2.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616-2.test
@@ -0,0 +1,5 @@
+query T nosort
+select current_schema
+----
+voc
+
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616-3.reqtests
b/sql/test/BugTracker/Tests/authorization.SF-1430616-3.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616-3.reqtests
@@ -0,0 +1,1 @@
+authorization.SF-1430616-1
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616-3.test
b/sql/test/BugTracker/Tests/authorization.SF-1430616-3.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/authorization.SF-1430616-3.test
@@ -0,0 +1,21 @@
+statement error 2BM37!DROP SCHEMA: unable to drop schema 'voc' (there are
database objects which depend on it)
+DROP SCHEMA voc
+
+statement error M1M05!DROP USER: 'voc' owns a schema
+DROP USER voc
+
+statement ok
+START TRANSACTION
+
+statement ok
+ALTER USER voc SET SCHEMA sys
+
+statement ok
+DROP SCHEMA voc
+
+statement ok
+DROP USER voc
+
+statement ok
+COMMIT
+
diff --git a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.py
b/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/authorization.SF-1430616.SQL.py
+++ /dev/null
@@ -1,46 +0,0 @@
-###
-# Check that when a user is decoupled from a schema, this dependency is
-# properly removed and both the schema and the user can be dropped
-###
-
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
-
- # create the dependency of user `voc` on schema `voc`
- tc.connect(username="monetdb", password="monetdb")
- tc.execute("CREATE USER voc WITH PASSWORD 'voc' NAME 'VOC Explorer' SCHEMA
sys;").assertSucceeded()
- tc.execute("""
- SELECT users.name, users.fullname, schemas.name as schema
- FROM users, schemas
- WHERE users.default_schema = schemas.id
- AND users.name = 'voc';
- """).assertSucceeded()\
- .assertDataResultMatch([('voc', 'VOC Explorer', 'sys')])
- tc.execute("CREATE SCHEMA voc AUTHORIZATION voc;").assertSucceeded()
- tc.execute("ALTER USER voc SET SCHEMA voc;").assertSucceeded()
- tc.execute("""
- SELECT users.name, users.fullname, schemas.name as schema
- FROM users, schemas
- WHERE users.default_schema = schemas.id
- AND users.name = 'voc';
- """).assertSucceeded()\
- .assertDataResultMatch([('voc', 'VOC Explorer', 'voc')])
-
- # just use the new user once
- tc.connect(username="voc", password="voc")
- tc.execute("select
current_schema;").assertSucceeded().assertDataResultMatch([('voc',)])
-
- tc.connect(username="monetdb", password="monetdb")
- # we can drop neither of them yet
- tc.execute("DROP SCHEMA voc;").assertFailed(err_code="2BM37",
err_message="DROP SCHEMA: unable to drop schema 'voc' (there are database
objects which depend on it)")
- tc.execute("DROP USER voc;").assertFailed(err_code="M1M05",
err_message="DROP USER: 'voc' owns a schema")
- # remove the dependency so that we can drop both of them
- tc.execute("""
- START TRANSACTION;
- ALTER USER voc SET SCHEMA sys;
- DROP SCHEMA voc;
- DROP USER voc;
- COMMIT;
- """).assertSucceeded()
-
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.SQL.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
- tc.connect(username="monetdb", password="monetdb")
- tc.execute("""
- create table tbl_xy (x int, y int);
- insert into tbl_xy values (0,0);
- insert into tbl_xy values (1,1);
- """).assertSucceeded()
-
- tc.execute("""
- insert into tbl_xy values (2,2);
- insert into tbl_xy values (3,3);
- insert into tbl_xy values (4,4);
- """).assertSucceeded()
-
- tc.execute("""
- insert into tbl_xy values (5,5);
- insert into tbl_xy values (6,6);
- insert into tbl_xy values (7,7);
- """).assertSucceeded()
-
- tc.execute("insert into tbl_xy values (-1,
-100);").assertSucceeded().assertRowCount(1)
-
- tc.execute("""
- insert into tbl_xy values (8,8);
- insert into tbl_xy values (9,9);
- insert into tbl_xy values (10,10);
- """).assertSucceeded()
-
- tc.execute("select * from
tbl_xy;").assertSucceeded().assertRowCount(12).assertDataResultMatch([(0,0),(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(-1,-100),(8,8),(9,9),(10,10)])
- tc.execute("drop table tbl_xy;").assertSucceeded()
diff --git a/sql/test/BugTracker/Tests/auto_commit.SF-1724151.test
b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker/Tests/auto_commit.SF-1724151.test
@@ -0,0 +1,94 @@
+statement ok
+start transaction
+
+statement ok
+create table tbl_xy (x int, y int)
+
+statement ok
+insert into tbl_xy values (0,0)
+
+statement ok
+insert into tbl_xy values (1,1)
+
+statement ok
+commit
+
+statement ok
+start transaction
+
+statement ok
+insert into tbl_xy values (2,2)
+
+statement ok
+insert into tbl_xy values (3,3)
+
+statement ok
+insert into tbl_xy values (4,4)
+
+statement ok
+commit
+
+statement ok
+start transaction
+
+statement ok
+insert into tbl_xy values (5,5)
+
+statement ok
+insert into tbl_xy values (6,6)
+
+statement ok
+insert into tbl_xy values (7,7)
+
+statement ok
+commit
+
+statement ok
+insert into tbl_xy values (-1, -100)
+
+statement ok
+start transaction
+
+statement ok
+insert into tbl_xy values (8,8)
+
+statement ok
+insert into tbl_xy values (9,9)
+
+statement ok
+insert into tbl_xy values (10,10)
+
+statement ok
+commit
+
+query II rowsort
+select * from tbl_xy
+----
+-1
+-100
+0
+0
+1
+1
+10
+10
+2
+2
+3
+3
+4
+4
+5
+5
+6
+6
+7
+7
+8
+8
+9
+9
+
+statement ok
+drop table tbl_xy
+
diff --git a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
deleted file mode 100644
--- a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.SQL.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
- tc.connect(username="monetdb", password="monetdb")
- tc.execute("select
1;").assertSucceeded().assertRowCount(1).assertDataResultMatch([(1,)])
diff --git a/sql/test/Skyserver/Tests/All b/sql/test/Skyserver/Tests/All
--- a/sql/test/Skyserver/Tests/All
+++ b/sql/test/Skyserver/Tests/All
@@ -1,2 +1,23 @@
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
