Changeset: aed886db099e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aed886db099e
Modified Files:
sql/test/ADT2006/Tests/benesamo.stable.out
sql/test/ADT2006/Tests/bram.stable.out
sql/test/ADT2006/Tests/slam.stable.out
sql/test/ADT2006/Tests/woud.stable.out
sql/test/Tests/50ways.stable.out
sql/test/Tests/alastair_udf_mergetable_bug.stable.out
sql/test/Tests/coalesce.stable.out
sql/test/Tests/count.stable.out
sql/test/Tests/decimal2.stable.out
sql/test/Tests/ifexists.stable.out
sql/test/Tests/keys.stable.out
sql/test/Tests/marcin1.stable.out
sql/test/Tests/marcin3.stable.out
sql/test/Tests/median_stdev.stable.out
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/Tests/order_by_simple_exp.stable.out
sql/test/Tests/outerref_in_selection.stable.out
sql/test/Tests/psm.stable.out
sql/test/Tests/rank.stable.out
sql/test/Tests/restart-sequence.stable.out
sql/test/Tests/round.stable.out
sql/test/Tests/session_vars.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/str-pad.stable.out
sql/test/Tests/str-trim.stable.out
sql/test/Tests/string.stable.out
sql/test/Tests/subqueries.stable.out
sql/test/Tests/table_function.stable.out
sql/test/Tests/timezone.stable.out
sql/test/Tests/trace.stable.out
sql/test/Tests/truncate-statements.stable.out
sql/test/Tests/window_functions.stable.out
sql/test/Tests/zones.stable.out
sql/test/Tests/zones2.stable.out
Branch: sq2default
Log Message:
approved output
diffs (truncated from 2689 to 300 lines):
diff --git a/sql/test/ADT2006/Tests/benesamo.stable.out
b/sql/test/ADT2006/Tests/benesamo.stable.out
--- a/sql/test/ADT2006/Tests/benesamo.stable.out
+++ b/sql/test/ADT2006/Tests/benesamo.stable.out
@@ -189,20 +189,20 @@ stdout of test 'benesamo` in directory '
[ "Ada", "Wilson", "(survived the attack on 1888-28-03)" ]
[ "Annie", "Farmer", "(survived the attack on 1888-11-20)" ]
#select count(*) from scene_witness where scene_id IN ( select scene_id from
scene where victim_id IN ( select victim_id from victim where
surname='Stride'));
-% sys.L14 # table_name
-% L14 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
[ 6 ]
#select count(*) from scene_inspector where inspector_id IN (Select
inspector_id from inspector where surname='Monro') Group by inspector_id;
-% sys.L5 # table_name
-% L5 # name
+% sys.%2 # table_name
+% %2 # name
% bigint # type
% 1 # length
[ 2 ]
#select count(*) from victim where eyes='blue';
-% sys.L3 # table_name
-% L3 # name
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 1 # length
[ 2 ]
@@ -256,8 +256,8 @@ stdout of test 'benesamo` in directory '
% 3, 6, 6, 8 # length
[ "Dr.", "George", "Baxter", "Phillips" ]
#SELECT count(*) FROM victim;
-% .L3 # table_name
-% L3 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 2 # length
[ 18 ]
diff --git a/sql/test/ADT2006/Tests/bram.stable.out
b/sql/test/ADT2006/Tests/bram.stable.out
--- a/sql/test/ADT2006/Tests/bram.stable.out
+++ b/sql/test/ADT2006/Tests/bram.stable.out
@@ -372,7 +372,7 @@ stdout of test 'bram` in directory 'sql/
#(select 4 AS mon, count(v.name) AS murders from victim v where extract(month
from v.date) = 4)
#UNION ALL
#(select 5 AS mon, count(v.name) AS murders from victim v where extract(month
from v.date) = 5)
-% .L177, .L177 # table_name
+% .%115, .%115 # table_name
% mon, murders # name
% tinyint, bigint # type
% 2, 1 # length
@@ -399,7 +399,7 @@ stdout of test 'bram` in directory 'sql/
#(select 5 AS mon, v.name AS victim from victim v where extract(month from
v.date) = 5)
#UNION ALL
#(select 6 AS mon, v.name AS victim from victim v where extract(month from
v.date) = 6)
-% .L147, .L147 # table_name
+% .%101, .%101 # table_name
% mon, victim # name
% tinyint, varchar # type
% 2, 42 # length
@@ -423,7 +423,7 @@ stdout of test 'bram` in directory 'sql/
[ 12, "Rose Mylett" ]
#select v.name, count(w.name) as witness_count from victim v JOIN witness w ON
(w.victim = v.name)
#GROUP BY v.name HAVING count(w.name) >= 2;
-% sys.v, sys.L4 # table_name
+% sys.v, sys.%3 # table_name
% name, witness_count # name
% varchar, bigint # type
% 17, 1 # length
@@ -435,7 +435,7 @@ stdout of test 'bram` in directory 'sql/
[ "Frances Coles", 2 ]
#select i.name, count(v.victim) AS cases from inspector i JOIN
inspector_victim v ON (v.inspector = i.name)
#GROUP BY i.name HAVING count(v.victim) > 1 order by i.name;
-% sys.i, sys.L4 # table_name
+% sys.i, sys.%3 # table_name
% name, cases # name
% varchar, bigint # type
% 23, 1 # length
@@ -455,7 +455,7 @@ stdout of test 'bram` in directory 'sql/
# WHERE name LIKE '%Inspector%')
# UNION ALL
#(SELECT 'Major' AS grade, count(name) AS inspectors FROM inspector
-% .L62, .L62 # table_name
+% .%34, .%34 # table_name
% grade, inspectors # name
% char, bigint # type
% 9, 1 # length
@@ -470,16 +470,16 @@ stdout of test 'bram` in directory 'sql/
#where
# length is not NULL and length like '%\'' and hair like '%blonde%')
#UNION ALL
-#(select name, (12*cast(substring(length from 0 for (position('\'' in length)
- 1)) AS integer)
-# + cast(substring(length from (position('\'' in length) + 1) for
(position('"' in length) - position('\'' in length) - 1)) AS integer)) as
height from victim v
-% .L67, .L67 # table_name
-% L20, average_height # name
+#(select name, (12*cast(substring(length from 0 for (position('''' in length)
- 1)) AS integer)
+# + cast(substring(length from (position('''' in length) + 1) for
(position('"' in length) - position('''' in length) - 1)) AS integer)) as
height from victim v
+% .%45, .%45 # table_name
+% %40, average_height # name
% char, varchar # type
% 6, 4 # length
[ "blonde", "5'7\"" ]
[ "brown", "5'6\"" ]
#SELECT name as victim FROM victim WHERE date_of_birth is null or
date_of_birth = 'unknown';
-% sys.L2 # table_name
+% sys.victim # table_name
% victim # name
% varchar # type
% 42 # length
@@ -503,7 +503,7 @@ stdout of test 'bram` in directory 'sql/
[ "Carrie Brown" ]
#select d.name as doctor, d.victim, v.date from doctor d JOIN victim v ON
(d.victim = v.name)
#WHERE not exists (select doc.name from doctor doc where doc.victim = v.name
and doc.name <> d.name);
-% sys.L5, sys.d, sys.v # table_name
+% sys.d, sys.d, sys.v # table_name
% doctor, victim, date # name
% varchar, varchar, date # type
% 0, 0, 10 # length
diff --git a/sql/test/ADT2006/Tests/slam.stable.out
b/sql/test/ADT2006/Tests/slam.stable.out
--- a/sql/test/ADT2006/Tests/slam.stable.out
+++ b/sql/test/ADT2006/Tests/slam.stable.out
@@ -238,7 +238,7 @@ stdout of test 'slam` in directory 'sql/
[ "Rose Mylett", NULL, NULL ]
[ "Whitehall Mystery", NULL, NULL ]
#SELECT i.name, count(si.scene_id) AS times FROM Jtr_inspector i LEFT OUTER
JOIN Jtr_scene_inspectors si ON i.name = si.inspector GROUP BY i.name ORDER BY
i.name, times desc;
-% .i, .L4 # table_name
+% .i, .%3 # table_name
% name, times # name
% varchar, bigint # type
% 45, 1 # length
@@ -269,7 +269,7 @@ stdout of test 'slam` in directory 'sql/
[ "Sir Robert Anderson", 1 ]
[ "Superintendent Thomas Arnold", 0 ]
#SELECT i.name AS name_inspector, d.name AS name_doctor FROM Jtr_scene s INNER
JOIN Jtr_scene_inspectors si ON si.scene_id = s.scene_id INNER JOIN
Jtr_scene_doctors sd ON sd.scene_id = s.scene_id INNER JOIN Jtr_inspector i ON
si.inspector = i.name INNER JOIN Jtr_doctor d ON sd.doctor = d.name ORDER BY
name_inspector, name_doctor;
-% sys.L2, sys.L4 # table_name
+% sys.i, sys.d # table_name
% name_inspector, name_doctor # name
% varchar, varchar # type
% 23, 26 # length
@@ -288,7 +288,7 @@ stdout of test 'slam` in directory 'sql/
[ "Mary Ann Walker", "brown", "brown hair turning grey", "five
front teeth missing (Rumbelow); two bottom-one top\n\t\t\t\tfront (Fido), her
teeth are slightly discoloured. She is\n\t\t\t\tdescribed as having small,
delicate features with high\n\t\t\t\tcheekbones and grey eyes. She has a small
scar on her\n\t\t\t\tforehead from a childhood injury. She is described
by\n\t\t\t\tEmily Holland as \"a very clean woman who always seemed\n\t\t\t\tto
keep to herself.\" The doctor at the post mortem\n\t\t\t\tremarked on the
cleanliness of her thighs. She is also\n\t\t\t\tan alcoholic." ]
[ "Pinchin Street Murder, possibly Lydia Hart", "", "", "body,
missing both head and legs" ]
#SELECT eyes, count(name) AS times FROM Jtr_victim WHERE NOT eyes = '' GROUP
BY eyes ORDER BY eyes, times desc;
-% sys.jtr_victim, sys.L4 # table_name
+% sys.jtr_victim, sys.%1 # table_name
% eyes, times # name
% varchar, bigint # type
% 10, 1 # length
@@ -298,7 +298,7 @@ stdout of test 'slam` in directory 'sql/
[ "light gray", 1 ]
[ "unknown", 1 ]
#SELECT s.victim, COUNT(w.witness) AS witnesses, COUNT(i.inspector) AS
inspectors, COUNT(d.doctor) AS doctors, COUNT(sp.suspect) AS suspects FROM
Jtr_scene s LEFT OUTER JOIN Jtr_scene_witnesses w ON w.scene_id = s.scene_id
LEFT OUTER JOIN Jtr_scene_inspectors i ON i.scene_id = s.scene_id LEFT OUTER
JOIN Jtr_scene_doctors d ON d.scene_id = s.scene_id LEFT OUTER JOIN
Jtr_scene_suspects sp ON sp.scene_id = s.scene_id GROUP BY s.victim ORDER BY
s.victim asc, witnesses, inspectors, doctors, suspects;
-% .s, .L4, .L7, .L12, .L15 # table_name
+% .s, .%11, .%12, .%13, .%14 # table_name
% victim, witnesses, inspectors, doctors, suspects # name
% varchar, bigint, bigint, bigint, bigint # type
% 42, 1, 1, 1, 1 # length
diff --git a/sql/test/ADT2006/Tests/woud.stable.out
b/sql/test/ADT2006/Tests/woud.stable.out
--- a/sql/test/ADT2006/Tests/woud.stable.out
+++ b/sql/test/ADT2006/Tests/woud.stable.out
@@ -63,8 +63,8 @@ stdout of test 'woud` in directory 'sql/
# FROM victim
# WHERE murderdate LIKE '1___%'
# AND dateofbirth LIKE '1___%';
-% sys.L4 # table_name
-% L4 # name
+% sys.%3 # table_name
+% %3 # name
% bigint # type
% 1 # length
#SELECT AVG(num)
@@ -77,8 +77,8 @@ stdout of test 'woud` in directory 'sql/
# WHERE name NOT IN
# (SELECT victim FROM sceneinspectors)
# ) AS numbers;
-% .L27 # table_name
-% L26 # name
+% .%11 # table_name
+% %11 # name
% double # type
% 24 # length
[ NULL ]
@@ -89,8 +89,8 @@ stdout of test 'woud` in directory 'sql/
#SELECT MIN(murderdate),MAX(murderdate)
# FROM victim
# WHERE murderdate LIKE '1%';
-% sys.L4, sys.L7 # table_name
-% L3, L6 # name
+% sys.%1, sys.%2 # table_name
+% %1, %2 # name
% varchar, varchar # type
% 0, 0 # length
[ NULL, NULL ]
diff --git a/sql/test/Tests/50ways.stable.out b/sql/test/Tests/50ways.stable.out
--- a/sql/test/Tests/50ways.stable.out
+++ b/sql/test/Tests/50ways.stable.out
@@ -27,8 +27,8 @@ stdout of test '50ways` in directory 'sq
#create table s ( snr int, sname varchar(30) );
#create table sp ( snr int, pnr varchar(30) );
#select 1;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 1 # length
[ 1 ]
@@ -37,8 +37,8 @@ stdout of test '50ways` in directory 'sq
% varchar # type
% 0 # length
#select 2;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 1 # length
[ 2 ]
@@ -47,8 +47,8 @@ stdout of test '50ways` in directory 'sq
% varchar # type
% 0 # length
#select 10;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 2 # length
[ 10 ]
@@ -57,28 +57,40 @@ stdout of test '50ways` in directory 'sq
% varchar # type
% 0 # length
#select 11;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 2 # length
[ 11 ]
-% sys.s # table_name
+#SELECT DISTINCT S.SNAME
+# FROM S
+# WHERE (SELECT COUNT(*)
+# FROM SP
+# WHERE SP.SNR = S.SNR
+# AND SP.PNR = 'P2' ) > 0;
+% .s # table_name
% sname # name
% varchar # type
% 0 # length
#select 12;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 2 # length
[ 12 ]
-% sys.s # table_name
+#SELECT DISTINCT S.SNAME
+# FROM S
+# WHERE (SELECT COUNT(*)
+# FROM SP
+# WHERE SP.SNR = S.SNR
+# AND SP.PNR = 'P2' ) = 1;
+% .s # table_name
% sname # name
% varchar # type
% 0 # length
#select 21;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 2 # length
[ 21 ]
@@ -87,8 +99,8 @@ stdout of test '50ways` in directory 'sq
% varchar # type
% 0 # length
#select 22;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
% 2 # length
[ 22 ]
@@ -97,8 +109,8 @@ stdout of test '50ways` in directory 'sq
% varchar # type
% 0 # length
#select 23;
-% .L2 # table_name
-% L2 # name
+% . # table_name
+% single_value # name
% tinyint # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
