Changeset: 588173ba46f7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/588173ba46f7 Modified Files: testing/sqllogictest.py Branch: default Log Message:
Merge with Sep2022 branch. diffs (truncated from 1784 to 300 lines): diff --git a/sql/test/Users/Tests/table_privs.test b/sql/test/Users/Tests/table_privs.test --- a/sql/test/Users/Tests/table_privs.test +++ b/sql/test/Users/Tests/table_privs.test @@ -1,32 +1,24 @@ -@connection(id=mdb, username=monetdb, password=monetdb) statement ok CREATE USER my_user with password 'p1' name 'User with role' schema sys -@connection(id=mdb) statement ok CREATE USER my_user2 with password 'p2' name 'User without role' schema sys -@connection(id=mdb) statement ok CREATE SCHEMA my_schema -@connection(id=mdb) statement ok CREATE table my_schema.test (i int, b bigint) -@connection(id=mdb) statement ok GRANT SELECT on table my_schema.test to my_user -@connection(id=mdb) statement ok GRANT INSERT on table my_schema.test to my_user -@connection(id=mdb) statement ok GRANT UPDATE on table my_schema.test to my_user -@connection(id=mdb) statement ok GRANT DELETE on table my_schema.test to my_user diff --git a/sql/test/transactions/Tests/transaction_isolation2.test b/sql/test/transactions/Tests/transaction_isolation2.test --- a/sql/test/transactions/Tests/transaction_isolation2.test +++ b/sql/test/transactions/Tests/transaction_isolation2.test @@ -1,44 +1,33 @@ -@connection(id=mdb1, username=monetdb, password=monetdb) statement ok start transaction -@connection(id=mdb1) statement ok CREATE TABLE integers (i int) -@connection(id=mdb1) statement ok insert into integers values (1),(2),(3),(NULL) -@connection(id=mdb1) statement ok CREATE TABLE longs (i bigint) -@connection(id=mdb1) statement ok CREATE TABLE doubles (d double precision) -@connection(id=mdb1) statement ok insert into longs values (1),(2),(3) -@connection(id=mdb1) statement ok insert into integers values (1),(2),(3) -@connection(id=mdb1) statement ok alter table longs add primary key (i) -@connection(id=mdb1) statement ok CREATE TABLE sys.myvar (c BIGINT) -@connection(id=mdb1) statement ok commit -@connection(id=mdb1) statement ok start transaction @@ -46,7 +35,6 @@ start transaction statement ok start transaction -@connection(id=mdb1) statement ok alter table integers add foreign key(i) references longs(i) @@ -54,7 +42,6 @@ alter table integers add foreign key(i) statement error 42000!ALTER TABLE: sys_integers_integers_i_fkey conflicts with another transaction alter table integers add foreign key(i) references longs(i) -@connection(id=mdb1) statement ok commit @@ -62,15 +49,12 @@ commit statement ok rollback -@connection(id=mdb1) statement ok create trigger ups after delete on integers referencing old row as old_row for each row insert into longs values(0) -@connection(id=mdb1) statement ok create trigger ups2 after delete on integers referencing old row as old_row for each row insert into longs values(10) -@connection(id=mdb1) statement ok start transaction @@ -78,7 +62,6 @@ start transaction statement ok start transaction -@connection(id=mdb1) statement ok create or replace trigger ups after delete on integers referencing old row as old_row for each row insert into longs values(1) @@ -86,7 +69,6 @@ create or replace trigger ups after dele statement error 42000!CREATE OR REPLACE TRIGGER: transaction conflict detected create or replace trigger ups after delete on integers referencing old row as old_row for each row insert into longs values(2) -@connection(id=mdb1) statement ok commit @@ -94,7 +76,6 @@ commit statement ok rollback -@connection(id=mdb1) statement ok start transaction @@ -102,7 +83,6 @@ start transaction statement ok start transaction -@connection(id=mdb1) statement ok drop trigger ups @@ -114,7 +94,6 @@ alter table doubles add primary key (d) statement error 42000!CREATE OR REPLACE TRIGGER: transaction conflict detected create or replace trigger ups after delete on integers referencing old row as old_row for each row insert into longs values(3) -@connection(id=mdb1) statement ok commit @@ -122,7 +101,6 @@ commit statement ok rollback -@connection(id=mdb1) statement ok start transaction @@ -130,7 +108,6 @@ start transaction statement ok start transaction -@connection(id=mdb1) statement ok create or replace trigger ups2 after delete on integers referencing old row as old_row for each row insert into longs values(15) @@ -162,15 +139,12 @@ drop trigger ups2 statement ok rollback -@connection(id=mdb1) statement ok drop trigger ups2 -@connection(id=mdb1) statement ok commit -@connection(id=mdb1) statement ok start transaction @@ -178,7 +152,6 @@ start transaction statement ok start transaction -@connection(id=mdb1) statement ok CREATE TYPE myurl EXTERNAL NAME url @@ -186,59 +159,6 @@ CREATE TYPE myurl EXTERNAL NAME url statement error 42000!CREATE TYPE: transaction conflict detected CREATE TYPE myurl EXTERNAL NAME url -@connection(id=mdb1) -statement ok -commit - -@connection(id=mdb2) -statement ok -rollback - -@connection(id=mdb1) -statement ok rowcount 1 -INSERT INTO sys.myvar VALUES ((SELECT COUNT(*) FROM sys.roles)) - -@connection(id=mdb1) -statement ok -start transaction - -@connection(id=mdb2) -statement ok -start transaction - -@connection(id=mdb1) -statement ok -CREATE ROLE myrole - -@connection(id=mdb2) -statement error 42000!CREATE ROLE: failed due to conflict with another transaction -CREATE ROLE myrole - -@connection(id=mdb1) -statement ok -commit - -@connection(id=mdb2) -statement error -commit - -@connection(id=mdb1) -statement ok -start transaction - -@connection(id=mdb2) -statement ok -start transaction - -@connection(id=mdb1) -statement ok -CREATE schema mysch AUTHORIZATION myrole - -@connection(id=mdb2) -statement error 42000!CREATE SCHEMA: transaction conflict detected -CREATE schema mysch AUTHORIZATION myrole - -@connection(id=mdb1) statement ok commit @@ -246,7 +166,9 @@ commit statement ok rollback -@connection(id=mdb1) +statement ok rowcount 1 +INSERT INTO sys.myvar VALUES ((SELECT COUNT(*) FROM sys.roles)) + statement ok start transaction @@ -254,7 +176,48 @@ start transaction statement ok start transaction -@connection(id=mdb1) +statement ok +CREATE ROLE myrole + +@connection(id=mdb2) +statement error 42000!CREATE ROLE: failed due to conflict with another transaction +CREATE ROLE myrole + +statement ok +commit + +@connection(id=mdb2) +statement error +commit + +statement ok +start transaction + +@connection(id=mdb2) +statement ok +start transaction + +statement ok +CREATE schema mysch AUTHORIZATION myrole + +@connection(id=mdb2) +statement error 42000!CREATE SCHEMA: transaction conflict detected +CREATE schema mysch AUTHORIZATION myrole + _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
