Changeset: 86b3223a9ec5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86b3223a9ec5 Modified Files: sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.sql sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.stable.out sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.sql sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.stable.out sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.sql sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.stable.out sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.sql sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.stable.out sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.sql sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.stable.out Branch: Oct2020 Log Message:
Clean up at the end of the tests and changed sanity check queries to produce determinable output diffs (242 lines): diff --git a/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.sql b/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.sql --- a/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.sql +++ b/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.sql @@ -16,3 +16,5 @@ release savepoint name1; select * from savepointtest; commit; +drop table if exists savepointtest; + diff --git a/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.stable.out b/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.stable.out --- a/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.stable.out +++ b/sql/test/BugTracker-2020/Tests/release_old_savepoint.Bug-7020.stable.out @@ -54,6 +54,7 @@ stdout of test 'release_old_savepoint.Bu [ 8 ] [ 9 ] #commit; +#drop table if exists savepointtest; # 09:05:47 > # 09:05:47 > "Done." diff --git a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.sql b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.sql --- a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.sql +++ b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.sql @@ -12,4 +12,4 @@ commit; select 42; select * from savepointtest; - +drop table if exists savepointtest; diff --git a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.stable.out b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.stable.out --- a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.stable.out +++ b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_1.Bug-7021.stable.out @@ -50,6 +50,7 @@ stdout of test 'savepoints_crash_mserver [ 7 ] [ 8 ] [ 9 ] +#drop table if exists savepointtest; # 11:57:44 > # 11:57:44 > "Done." diff --git a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.sql b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.sql --- a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.sql +++ b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.sql @@ -12,4 +12,4 @@ commit; select 42; select * from savepointtest; - +drop table if exists savepointtest; diff --git a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.stable.out b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.stable.out --- a/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.stable.out +++ b/sql/test/BugTracker-2020/Tests/savepoints_crash_mserver5_2.Bug-7021.stable.out @@ -50,6 +50,7 @@ stdout of test 'savepoints_crash_mserver [ 7 ] [ 8 ] [ 9 ] +#drop table if exists savepointtest; # 12:00:17 > # 12:00:17 > "Done." diff --git a/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.sql b/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.sql --- a/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.sql +++ b/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.sql @@ -5,15 +5,15 @@ savepoint name1; insert into savepointtest values(24); release savepoint name1; commit; -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; select * from savepointtest; create table savepointtest (id int, primary key(id)); insert into savepointtest values(42); -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; select * from savepointtest; drop table savepointtest; -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; -- this shows errors start transaction; @@ -21,13 +21,13 @@ create table savepointtest (id int, prim savepoint name1; insert into savepointtest values(24); commit; -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; select * from savepointtest; create table savepointtest (id int, primary key(id)); insert into savepointtest values(42); -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; -- the 2nd 'savepointtest` is used by SELECT and DROP select * from savepointtest; drop table savepointtest; -select * from tables where name = 'savepointtest'; +select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; diff --git a/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.stable.out b/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.stable.out --- a/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.stable.out +++ b/sql/test/BugTracker-2020/Tests/transaction_with_unreleased_savepoint.Bug-7022.stable.out @@ -12,12 +12,12 @@ stdout of test 'transaction_with_unrelea [ 1 ] #release savepoint name1; #commit; -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 4, 13, 4, 0, 1, 5, 1, 1, 1 # length -[ 7399, "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 13, 4, 0, 1, 5, 1, 1, 1 # length +[ "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] #select * from savepointtest; % sys.savepointtest # table_name % id # name @@ -26,12 +26,12 @@ stdout of test 'transaction_with_unrelea [ 24 ] #insert into savepointtest values(42); [ 1 ] -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 4, 13, 4, 0, 1, 5, 1, 1, 1 # length -[ 7399, "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 13, 4, 0, 1, 5, 1, 1, 1 # length +[ "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] #select * from savepointtest; % sys.savepointtest # table_name % id # name @@ -40,23 +40,23 @@ stdout of test 'transaction_with_unrelea [ 24 ] [ 42 ] #drop table savepointtest; -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 1, 0, 1, 0, 1, 5, 1, 1, 1 # length +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 0, 1, 0, 1, 5, 1, 1, 1 # length #start transaction; #create table savepointtest (id int, primary key(id)); #savepoint name1; #insert into savepointtest values(24); [ 1 ] #commit; -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 4, 13, 4, 0, 1, 5, 1, 1, 1 # length -[ 7404, "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 13, 4, 0, 1, 5, 1, 1, 1 # length +[ "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] #select * from savepointtest; % sys.savepointtest # table_name % id # name @@ -65,12 +65,12 @@ stdout of test 'transaction_with_unrelea [ 24 ] #insert into savepointtest values(42); [ 1 ] -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 4, 13, 4, 0, 1, 5, 1, 1, 1 # length -[ 7404, "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 13, 4, 0, 1, 5, 1, 1, 1 # length +[ "savepointtest", 2000, NULL, 0, false, 0, 0, 0 ] #select * from savepointtest; % sys.savepointtest # table_name % id # name @@ -79,11 +79,11 @@ stdout of test 'transaction_with_unrelea [ 24 ] [ 42 ] #drop table savepointtest; -#select * from tables where name = 'savepointtest'; -% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name -% id, name, schema_id, query, type, system, commit_action, access, temporary # name -% int, varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type -% 1, 0, 1, 0, 1, 5, 1, 1, 1 # length +#select name, schema_id, query, type, system, commit_action, access, temporary from tables where name = 'savepointtest'; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% name, schema_id, query, type, system, commit_action, access, temporary # name +% varchar, int, varchar, smallint, boolean, smallint, smallint, tinyint # type +% 0, 1, 0, 1, 5, 1, 1, 1 # length # 14:14:40 > # 14:14:40 > "Done." diff --git a/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.sql b/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.sql --- a/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.sql +++ b/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.sql @@ -1,6 +1,8 @@ +start transaction; create table tst (k integer not null, name char(20) not null); -- this works select min(k) from tst group by name; -- but putting it in a VIEW doesn't create view v1 as select max(k) from tst group by name; select * from v1; +rollback; diff --git a/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.stable.out b/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.stable.out --- a/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.stable.out +++ b/sql/test/BugTracker-2020/Tests/view_with_aggr_column.Bug-7023.stable.out @@ -5,6 +5,7 @@ stdout of test 'view_with_aggr_column.Bu # 15:22:56 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-177928" "--port=37553" # 15:22:56 > +#start transaction; #create table tst (k integer not null, name char(20) not null); #select min(k) from tst group by name; % sys.%1 # table_name @@ -17,6 +18,7 @@ stdout of test 'view_with_aggr_column.Bu % %1 # name % int # type % 1 # length +#rollback; # 15:22:56 > # 15:22:56 > "Done." _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
