Changeset: 0d9c47e8a1cd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d9c47e8a1cd Modified Files: sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out Branch: subquery Log Message:
approved output diffs (76 lines): diff --git a/sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out b/sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out --- a/sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out +++ b/sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out @@ -134,9 +134,9 @@ Ready. % c1, c2 # name % bigint, bigint # type % 1, 1 # length -[ 3, 1 ] [ 3, 0 ] [ 3, 0 ] +[ 3, 1 ] #SELECT (SELECT COUNT(id) AS cnt1 # FROM test1 # ) @@ -150,9 +150,9 @@ Ready. % cnt1, cnt2 # name % bigint, bigint # type % 1, 1 # length -[ 3, 1 ] [ 3, 0 ] [ 3, 0 ] +[ 3, 1 ] #SELECT (SELECT COUNT(id) AS cnt1 # FROM test1 # ) @@ -166,9 +166,9 @@ Ready. % cnt1, c2 # name % bigint, bigint # type % 1, 1 # length -[ 3, 1 ] [ 3, 0 ] [ 3, 0 ] +[ 3, 1 ] #SELECT (SELECT COUNT(b.id) AS cnt2 # FROM test2 b # WHERE a.id = b.id @@ -182,9 +182,9 @@ Ready. % c2, c1 # name % bigint, bigint # type % 1, 1 # length -[ 1, 3 ] [ 0, 3 ] [ 0, 3 ] +[ 1, 3 ] #SELECT (SELECT COUNT(id) AS cnt1 # FROM test1 # ) AS c1 @@ -198,9 +198,9 @@ Ready. % c1, c2 # name % bigint, bigint # type % 1, 1 # length -[ 3, 1 ] [ 3, 0 ] [ 3, 0 ] +[ 3, 1 ] #DROP TABLE test1; #DROP TABLE test2; diff --git a/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out --- a/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out +++ b/sql/test/BugTracker-2014/Tests/order_by_incorrect_error.Bug-3630.stable.out @@ -39,10 +39,10 @@ Ready. #"delay" INTEGER, #"lon" DOUBLE, #select a.recordedattime, a.monexpectedarr, a.monexpecteddep, a.monaimedarr, b.monaimeddep, a.delay, b.delay, (b.recordedattime - a.monaimedarr)/1000 as ourdelay, b.recordedattime, b.monexpectedarr, b.monexpecteddep, monstopref from sirivm as a join sirivm as b using (vehiclenumber, lineref, datedvehiclejourneyref, monstopref) where a.monatstop = 'false' and b.monatstop = 'true' order by abs(ourdelay) desc limit 10; -% sys.a, sys.a, sys.a, sys.a, sys.b, sys.a, sys.b, sys.L14, sys.b, sys.b, sys.b, sys.L1, sys.L22 # table_name -% recordedattime, monexpectedarr, monexpecteddep, monaimedarr, monaimeddep, delay, delay, ourdelay, recordedattime, monexpectedarr, monexpecteddep, monstopref, L22 # name -% timestamp, timestamp, timestamp, timestamp, timestamp, int, int, sec_interval, timestamp, timestamp, timestamp, clob, sec_interval # type -% 26, 26, 26, 26, 26, 1, 1, 5, 26, 26, 26, 0, 5 # length +% sys.a, sys.a, sys.a, sys.a, sys.b, sys.a, sys.b, sys.L14, sys.b, sys.b, sys.b, sys.L1 # table_name +% recordedattime, monexpectedarr, monexpecteddep, monaimedarr, monaimeddep, delay, delay, ourdelay, recordedattime, monexpectedarr, monexpecteddep, monstopref # name +% timestamp, timestamp, timestamp, timestamp, timestamp, int, int, sec_interval, timestamp, timestamp, timestamp, clob # type +% 26, 26, 26, 26, 26, 1, 1, 5, 26, 26, 26, 0 # length #drop TABLE "sys"."sirivm"; # 15:51:46 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list