Changeset: 275fc66f102f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=275fc66f102f Modified Files: sql/src/test/Tests/big-example.stable.out sql/src/test/example-delete1.sql sql/src/test/example-delete2.sql sql/src/test/example-delete3.sql sql/src/test/example-queries.sql sql/src/test/example-rangeselect.sql sql/src/test/example-transaction.sql sql/src/test/example-update-view.sql sql/src/test/example-update1.sql sql/src/test/example-update2.sql sql/src/test/example-update3.sql sql/src/test/example.sql Branch: Oct2010 Log Message:
sort on unique columns to avoid ambiguous output order diffs (145 lines): diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/Tests/big-example.stable.out --- a/sql/src/test/Tests/big-example.stable.out Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/Tests/big-example.stable.out Sat Oct 30 17:55:52 2010 +0200 @@ -448,8 +448,8 @@ % val1, val2, val3 # name % int, varchar, double # type % 2, 6, 22 # length +[ -5, "testx", 9.1 ] [ -5, "xtest", 0.9 ] -[ -5, "testx", 9.1 ] [ 0, "texst", 99999.1 ] [ 1, "test", 0.1 ] [ 8, "texxst", 0.0001 ] @@ -458,9 +458,9 @@ % val1, val2, val3 # name % int, varchar, double # type % 2, 6, 22 # length -[ -5, "xtest", 0.9 ] [ -5, "testx", 9.1 ] [ -5, "texxst", 0.0001 ] +[ -5, "xtest", 0.9 ] [ 0, "texst", 99999.1 ] [ 1, "test", 0.1 ] diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-delete1.sql --- a/sql/src/test/example-delete1.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-delete1.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,3 +1,3 @@ -select * from example order by val1; +select * from example order by val1, val2; delete from example where val1 >= 5; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-delete2.sql --- a/sql/src/test/example-delete2.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-delete2.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,7 +1,7 @@ -select * from example order by val1; +select * from example order by val1, val2; delete from example where val1 = 5; -select * from example order by val1; +select * from example order by val1, val2; delete from example where val1 = 9; -select * from example order by val1; +select * from example order by val1, val2; delete from example where val1 = 8; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-delete3.sql --- a/sql/src/test/example-delete3.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-delete3.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,3 +1,3 @@ -select * from example order by val1; +select * from example order by val1, val2; delete from example where val1 > 5; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-queries.sql --- a/sql/src/test/example-queries.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-queries.sql Sat Oct 30 17:55:52 2010 +0200 @@ -5,6 +5,6 @@ insert into example values( 0, 'texst', 99999.1 ); insert into example values( 8, 'texxst', 0.0001 ); -select * from example order by val1; +select * from example order by val1, val2; -select * from example_view order by val1; +select * from example_view order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-rangeselect.sql --- a/sql/src/test/example-rangeselect.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-rangeselect.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,2 +1,2 @@ -select * from example where val1 >= 5 order by val1; -select * from example_view where val1 > 5 order by val1; +select * from example where val1 >= 5 order by val1, val2; +select * from example_view where val1 > 5 order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-transaction.sql --- a/sql/src/test/example-transaction.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-transaction.sql Sat Oct 30 17:55:52 2010 +0200 @@ -10,6 +10,6 @@ COMMIT; -select * from example order by val1; +select * from example order by val1, val2; -select * from example_view order by val1; +select * from example_view order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-update-view.sql --- a/sql/src/test/example-update-view.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-update-view.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,3 +1,3 @@ -select * from example_view order by val1; +select * from example_view order by val1, val2; update example_view set val3=-1.0 where val1 >= 5; -select * from example_view order by val1; +select * from example_view order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-update1.sql --- a/sql/src/test/example-update1.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-update1.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,3 +1,3 @@ -select * from example order by val1; +select * from example order by val1, val2; update example set val3=-1.0 where val1 >= 5; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-update2.sql --- a/sql/src/test/example-update2.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-update2.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,7 +1,7 @@ -select * from example order by val1; +select * from example order by val1, val2; update example set val1 = -5 where val1 = 5; -select * from example order by val1; +select * from example order by val1, val2; update example set val1 = -5 where val1 = 9; -select * from example order by val1; +select * from example order by val1, val2; update example set val1 = -5 where val1 = 8; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example-update3.sql --- a/sql/src/test/example-update3.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example-update3.sql Sat Oct 30 17:55:52 2010 +0200 @@ -1,3 +1,3 @@ -select * from example order by val1; +select * from example order by val1, val2; update example set val2 = 'updated' where val1 > 5; -select * from example order by val1; +select * from example order by val1, val2; diff -r 2916a09fa93a -r 275fc66f102f sql/src/test/example.sql --- a/sql/src/test/example.sql Sat Oct 30 17:48:54 2010 +0200 +++ b/sql/src/test/example.sql Sat Oct 30 17:55:52 2010 +0200 @@ -6,8 +6,8 @@ insert into example values( 0, 'texst', 99999.1 ); insert into example values( 8, 'texxst', 0.0001 ); -select * from example order by val1; +select * from example order by val1, val2; -select * from example_view order by val1; +select * from example_view order by val1, val2; -- drop view example_view; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
