Changeset: d7c71dea5dbe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7c71dea5dbe Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/select1.test sql/test/null/sqllogictest/Tests/coalesce.test sql/test/null/sqllogictest/Tests/coalesce2.test sql/test/null/sqllogictest/Tests/coalesce3.test testing/mktest.py Branch: mtest Log Message:
fix mktest diffs (67 lines): diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test --- a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test @@ -96,7 +96,7 @@ SELECT CASE WHEN c>(SELECT avg(c) FROM t FROM t1 ORDER BY 1 ---- -30 values hashing to 3c13dee48d9356ae19af2515e05e6b54 +30 values hashing to 3c13dee48d9356ae19af2515e05e6b5 query II nosort SELECT a+b*2+c*3+d*4+e*5, diff --git a/sql/test/null/sqllogictest/Tests/coalesce.test b/sql/test/null/sqllogictest/Tests/coalesce.test --- a/sql/test/null/sqllogictest/Tests/coalesce.test +++ b/sql/test/null/sqllogictest/Tests/coalesce.test @@ -51,7 +51,6 @@ FROM my_table2 y WHERE y.col1 = x.col1) FROM ( SELECT * FROM my_table1 ) x - ---- 10 values hashing to e0145663d590ae02decc8cdc9071e0c2 diff --git a/sql/test/null/sqllogictest/Tests/coalesce2.test b/sql/test/null/sqllogictest/Tests/coalesce2.test --- a/sql/test/null/sqllogictest/Tests/coalesce2.test +++ b/sql/test/null/sqllogictest/Tests/coalesce2.test @@ -48,7 +48,6 @@ SELECT (SELECT y.col2 FROM my_table2 y W FROM ( SELECT * FROM my_table1 ) x - ---- 10 values hashing to da0f81f3773ec10b245318fdf05e21ce @@ -57,7 +56,6 @@ SELECT COALESCE((SELECT y.col2 FROM my_t FROM ( SELECT * FROM my_table1 ) x - ---- 10 values hashing to e0145663d590ae02decc8cdc9071e0c2 diff --git a/sql/test/null/sqllogictest/Tests/coalesce3.test b/sql/test/null/sqllogictest/Tests/coalesce3.test --- a/sql/test/null/sqllogictest/Tests/coalesce3.test +++ b/sql/test/null/sqllogictest/Tests/coalesce3.test @@ -50,7 +50,6 @@ FROM ( SELECT * FROM my_table1 ) x ORDER BY id - ---- 20 values hashing to 90517be8b415ee2ec661c591e9f0c97f diff --git a/testing/mktest.py b/testing/mktest.py --- a/testing/mktest.py +++ b/testing/mktest.py @@ -77,7 +77,9 @@ while True: if '--' in line: line = line[:line.index('--')].rstrip() if line.endswith(';'): - query.append(line.rstrip(';')) + stripped = line.rstrip(';') + if stripped !='': + query.append(stripped) query = '\n'.join(query) try: crs.execute(query) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list