Changeset: af3187a31015 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af3187a31015 Modified Files: sql/test/sciql/Tests/06_slice_01.stable.err sql/test/sciql/Tests/06_slice_01.stable.out sql/test/sciql/Tests/07_tiling_04.stable.out sql/test/sciql/Tests/08_subquery_01.stable.err sql/test/sciql/Tests/08_subquery_01.stable.out sql/test/sciql/Tests/08_subquery_02.stable.err sql/test/sciql/Tests/08_subquery_02.stable.out sql/test/sciql/Tests/09_ary_ret_func.stable.out Branch: sciql Log Message:
approved expected changes in stable.{out,err} diffs (120 lines): diff --git a/sql/test/sciql/Tests/06_slice_01.stable.err b/sql/test/sciql/Tests/06_slice_01.stable.err --- a/sql/test/sciql/Tests/06_slice_01.stable.err +++ b/sql/test/sciql/Tests/06_slice_01.stable.err @@ -1,4 +1,4 @@ -stderr of test '06_slice_01` in directory 'test/sciql` itself: +stderr of test '06_slice_01` in directory 'sql/test/sciql` itself: # 18:21:25 > diff --git a/sql/test/sciql/Tests/06_slice_01.stable.out b/sql/test/sciql/Tests/06_slice_01.stable.out --- a/sql/test/sciql/Tests/06_slice_01.stable.out +++ b/sql/test/sciql/Tests/06_slice_01.stable.out @@ -1,4 +1,4 @@ -stdout of test '06_slice_01` in directory 'test/sciql` itself: +stdout of test '06_slice_01` in directory 'sql/test/sciql` itself: # 14:11:57 > diff --git a/sql/test/sciql/Tests/07_tiling_04.stable.out b/sql/test/sciql/Tests/07_tiling_04.stable.out --- a/sql/test/sciql/Tests/07_tiling_04.stable.out +++ b/sql/test/sciql/Tests/07_tiling_04.stable.out @@ -1,4 +1,4 @@ -stdout of test '07_tiling_04` in directory 'test/sciql` itself: +stdout of test '07_tiling_04` in directory 'sql/test/sciql` itself: # 23:07:55 > diff --git a/sql/test/sciql/Tests/08_subquery_01.stable.err b/sql/test/sciql/Tests/08_subquery_01.stable.err --- a/sql/test/sciql/Tests/08_subquery_01.stable.err +++ b/sql/test/sciql/Tests/08_subquery_01.stable.err @@ -1,4 +1,4 @@ -stderr of test '08_subquery_01` in directory 'test/sciql` itself: +stderr of test '08_subquery_01` in directory 'sql/test/sciql` itself: # 15:44:55 > diff --git a/sql/test/sciql/Tests/08_subquery_01.stable.out b/sql/test/sciql/Tests/08_subquery_01.stable.out --- a/sql/test/sciql/Tests/08_subquery_01.stable.out +++ b/sql/test/sciql/Tests/08_subquery_01.stable.out @@ -1,4 +1,4 @@ -stdout of test '08_subquery_01` in directory 'test/sciql` itself: +stdout of test '08_subquery_01` in directory 'sql/test/sciql` itself: # 18:14:48 > @@ -27,14 +27,14 @@ Ready. #CREATE ARRAY ary(x INT DIMENSION[4], y INT DIMENSION[-5], v FLOAT DEFAULT 3.7); #SELECT x, SUM(v), COUNT(*) FROM (SELECT * FROM ary[1:3]) AS a GROUP BY x; % sys.a, sys.a, sys.a # table_name -% x, L2, L3 # name +% x, L1, L2 # name % int, double, wrd # type % 1, 24, 1 # length [ 1, 18.5, 5 ] [ 2, 18.5, 5 ] #SELECT x, SUM(v) FROM (SELECT * FROM ary[1:3]) AS a GROUP BY a[x-1:x+1][y+1:y-1]; % sys.a, sys. # table_name -% x, L2 # name +% x, L1 # name % int, double # type % 1, 24 # length [ 1, 3.7 ] diff --git a/sql/test/sciql/Tests/08_subquery_02.stable.err b/sql/test/sciql/Tests/08_subquery_02.stable.err --- a/sql/test/sciql/Tests/08_subquery_02.stable.err +++ b/sql/test/sciql/Tests/08_subquery_02.stable.err @@ -1,4 +1,4 @@ -stderr of test '08_subquery_02` in directory 'test/sciql` itself: +stderr of test '08_subquery_02` in directory 'sql/test/sciql` itself: # 15:01:40 > @@ -30,10 +30,10 @@ stderr of test '08_subquery_02` in direc # 15:01:40 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=riga" "--port=32229" # 15:01:40 > -MAPI = monetdb@riga:32229 +MAPI = (monetdb) /var/tmp/mtest-29912/.s.monetdb.33795 QUERY = WITH a AS (SELECT * FROM ary[1:3]), b AS(SELECT * FROM ary[*][-1:-3]) SELECT x, y, SUM(v), AVG(v) FROM a GROUP BY b[x-1:x+1][y+1:y-1]; ERROR = !SELECT: no such array 'sys.b' -MAPI = monetdb@riga:32229 +MAPI = (monetdb) /var/tmp/mtest-29912/.s.monetdb.33795 QUERY = WITH a AS (SELECT * FROM ary[1:3]), b AS(SELECT * FROM ary[*][-1:-3]) SELECT x, y, SUM(v), AVG(v) FROM b GROUP BY a[x-1:x+1][y+1:y-1]; ERROR = !SELECT: no such array 'sys.a' diff --git a/sql/test/sciql/Tests/08_subquery_02.stable.out b/sql/test/sciql/Tests/08_subquery_02.stable.out --- a/sql/test/sciql/Tests/08_subquery_02.stable.out +++ b/sql/test/sciql/Tests/08_subquery_02.stable.out @@ -1,4 +1,4 @@ -stdout of test '08_subquery_02` in directory 'test/sciql` itself: +stdout of test '08_subquery_02` in directory 'sql/test/sciql` itself: # 15:01:53 > @@ -50,7 +50,7 @@ Ready. #CREATE ARRAY ary(x INT DIMENSION[4], y INT DIMENSION[-5], v FLOAT DEFAULT 3.7); #WITH a AS (SELECT * FROM ary[1:3]) SELECT x, y, SUM(v), AVG(v) FROM a GROUP BY a[x-1:x+1][y+1:y-1]; % sys.a, sys.a, sys., sys. # table_name -% x, y, L2, L3 # name +% x, y, L1, L2 # name % int, int, double, double # type % 1, 2, 24, 24 # length [ 1, 0, 3.7, 3.7 ] @@ -65,7 +65,7 @@ Ready. [ 2, -4, 14.8, 3.7 ] #WITH a AS (SELECT * FROM ary[1:3]), b AS(SELECT * FROM ary[*][-1:-3]) SELECT x, y, SUM(v), AVG(v) FROM b GROUP BY b[x-1:x+1][y+1:y-1]; % sys.b, sys.b, sys., sys. # table_name -% x, y, L3, L4 # name +% x, y, L1, L2 # name % int, int, double, double # type % 1, 2, 24, 24 # length [ 0, -1, 3.7, 3.7 ] diff --git a/sql/test/sciql/Tests/09_ary_ret_func.stable.out b/sql/test/sciql/Tests/09_ary_ret_func.stable.out --- a/sql/test/sciql/Tests/09_ary_ret_func.stable.out +++ b/sql/test/sciql/Tests/09_ary_ret_func.stable.out @@ -1,4 +1,4 @@ -stdout of test '09_ary_ret_func` in directory 'test/sciql` itself: +stdout of test '09_ary_ret_func` in directory 'sql/test/sciql` itself: # 18:49:56 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list