Changeset: c342fe1a9aeb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c342fe1a9aeb
Added Files:
sql/test/transactions/Tests/transaction_isolation.test
sql/test/transactions/Tests/transaction_isolation2.test
sql/test/transactions/Tests/transaction_isolation3.test
sql/test/transactions/Tests/transaction_isolation4.test
sql/test/transactions/Tests/transaction_isolation5.test
Removed Files:
sql/test/transactions/Tests/transaction_isolation.SQL.py
sql/test/transactions/Tests/transaction_isolation2.SQL.py
sql/test/transactions/Tests/transaction_isolation3.SQL.py
sql/test/transactions/Tests/transaction_isolation4.SQL.py
sql/test/transactions/Tests/transaction_isolation5.SQL.py
Branch: Sep2022
Log Message:
Converted to .test format. Note: rollback difference in test 5.
diffs (truncated from 5384 to 300 lines):
diff --git a/sql/test/transactions/Tests/transaction_isolation.SQL.py
b/sql/test/transactions/Tests/transaction_isolation.test
rename from sql/test/transactions/Tests/transaction_isolation.SQL.py
rename to sql/test/transactions/Tests/transaction_isolation.test
--- a/sql/test/transactions/Tests/transaction_isolation.SQL.py
+++ b/sql/test/transactions/Tests/transaction_isolation.test
@@ -1,217 +1,1044 @@
-from MonetDBtesting.sqltest import SQLTestCase
+@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)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok
+start transaction
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 4
+TRUNCATE integers
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
-with SQLTestCase() as mdb1:
- with SQLTestCase() as mdb2:
- mdb1.connect(username="monetdb", password="monetdb")
- mdb2.connect(username="monetdb", password="monetdb")
- mdb1.execute("CREATE TABLE integers (i int);").assertSucceeded()
- mdb1.execute("insert into integers values
(1),(2),(3),(NULL);").assertSucceeded()
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 3
+insert into integers values (4),(5),(6)
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+5
+6
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 1
+update integers set i = 7 where i = 6
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+5
+7
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 1
+delete from integers where i = 5
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+7
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
- mdb1.execute('start transaction;').assertSucceeded()
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute('TRUNCATE integers;').assertRowCount(4)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("insert into integers values
(4),(5),(6);").assertRowCount(3)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(5,),(6,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("update integers set i = 7 where i =
6;").assertRowCount(1)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(5,),(7,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("delete from integers where i = 5;").assertRowCount(1)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(7,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute('rollback;').assertSucceeded()
+@connection(id=mdb1)
+statement ok
+rollback
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok
+start transaction
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 4
+TRUNCATE integers
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
- mdb1.execute('start transaction;').assertSucceeded()
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute('TRUNCATE integers;').assertRowCount(4)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("insert into integers values
(4),(5),(6);").assertRowCount(3)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(5,),(6,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("update integers set i = 7 where i =
6;").assertRowCount(1)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(5,),(7,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute("delete from integers where i = 5;").assertRowCount(1)
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(7,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(1,),(2,),(3,),(None,)])
- mdb1.execute('commit;').assertSucceeded()
+@connection(id=mdb1)
+statement ok rowcount 3
+insert into integers values (4),(5),(6)
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+5
+6
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 1
+update integers set i = 7 where i = 6
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+5
+7
- mdb1.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(7,)])
- mdb2.execute('SELECT i FROM
integers;').assertSucceeded().assertDataResultMatch([(4,),(7,)])
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
+3
+NULL
+
+@connection(id=mdb1)
+statement ok rowcount 1
+delete from integers where i = 5
+
+@connection(id=mdb1)
+query I nosort
+SELECT i FROM integers
+----
+4
+7
+
+@connection(id=mdb2)
+query I nosort
+SELECT i FROM integers
+----
+1
+2
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
