Changeset: 010eb51544f7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=010eb51544f7 Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql Branch: Jul2015 Log Message:
Added START TRANASCTION; and ROLLBACK; to the .sql scripts such that a Timeouted execution does not leave tables with the same table name. Disabled a failing CREATE INDEX statement (see also Bug 3799) as it created a problem in the TRANSACTION handling: request to ROLLBACK the work, which is not what we want in this script. Extended timeout factor for selec3.test as on Win2012 (on default branch) is requires just a little bit more time. diffs (103 lines): diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql --- a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql @@ -1,3 +1,5 @@ +START TRANSACTION; + CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER); INSERT INTO t1(e,c,b,d,a) VALUES(103,102,100,101,104); INSERT INTO t1(a,c,d,e,b) VALUES(107,106,108,109,105); @@ -12127,3 +12129,5 @@ SELECT c -- cleanup created tables DROP TABLE t1; + +ROLLBACK; diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql b/sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql --- a/sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql @@ -1,3 +1,5 @@ +START TRANSACTION; + CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER); INSERT INTO t1(e,c,b,d,a) VALUES(NULL,102,NULL,101,104); INSERT INTO t1(a,c,d,e,b) VALUES(107,106,108,109,105); @@ -11155,3 +11157,5 @@ ORDER BY 1; -- cleanup created tables DROP TABLE t1; + +ROLLBACK; diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql --- a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql @@ -1,3 +1,5 @@ +START TRANSACTION; + CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER, d INTEGER, e INTEGER); INSERT INTO t1(e,c,b,d,a) VALUES(NULL,102,NULL,101,104); INSERT INTO t1(a,c,d,e,b) VALUES(107,106,108,109,105); @@ -40706,3 +40708,5 @@ SELECT CASE a+1 WHEN b THEN 111 WHEN c T -- cleanup created tables DROP TABLE t1; + +ROLLBACK; diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout --- a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout @@ -1,1 +1,1 @@ -2 +4 diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql --- a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql @@ -1,3 +1,5 @@ +START TRANSACTION; + CREATE TABLE t1( a1 INTEGER, b1 INTEGER, @@ -1130,7 +1132,7 @@ CREATE INDEX t4b4 ON t4(b4); CREATE INDEX t5c5 ON t5(c5); CREATE INDEX t6d6 ON t6(d6); CREATE INDEX t7e7 ON t7(e7); -CREATE INDEX t8all ON t8(e8 DESC, d8 ASC, c8 DESC, b8 ASC, a8 DESC); +-- CREATE INDEX t8all ON t8(e8 DESC, d8 ASC, c8 DESC, b8 ASC, a8 DESC); -- disabled as it is not supported by MonetDB and cuases the transaction to become invalid and requering a ROLLback which we do not want to do. -- query IIIIIT rowsort all1 SELECT * FROM t1 @@ -46259,3 +46261,5 @@ DROP TABLE t6; DROP TABLE t7; DROP TABLE t8; DROP TABLE t9; + +ROLLBACK; diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err --- a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err @@ -30,9 +30,6 @@ stderr of test 'select4.test` in directo # 12:25:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-32227" "--port=36911" # 12:25:12 > -MAPI = (monetdb) /var/tmp/mtest-25187/.s.monetdb.39757 -QUERY = CREATE INDEX t8all ON t8(e8 DESC, d8 ASC, c8 DESC, b8 ASC, a8 DESC); -ERROR = !syntax error, unexpected DESC, expecting ')' or ',' in: "create index t8all on t8(e8 desc" # 12:25:36 > # 12:25:36 > "Done." diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql b/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql --- a/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql @@ -1,3 +1,5 @@ +START TRANSACTION; + CREATE TABLE t1( a1 INTEGER PRIMARY KEY, b1 INTEGER, @@ -30604,3 +30606,5 @@ DROP TABLE t61; DROP TABLE t62; DROP TABLE t63; DROP TABLE t64; + +ROLLBACK; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
