Changeset: ef5e9ab66b50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef5e9ab66b50
Modified Files:
sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
sql/test/mapi/Tests/perl_dbi.stable.out
sql/test/mapi/Tests/python2_dbapi.stable.out
sql/test/mapi/Tests/python3_dbapi.stable.out
Branch: default
Log Message:
Approved output.
diffs (205 lines):
diff --git a/sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
b/sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
--- a/sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
+++ b/sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out
@@ -46,8 +46,8 @@ stdout of test 'ambiguous.Bug-3803` in d
#INSERT INTO t1(a,d,b,e,c) VALUES(138,136,139,135,137);
[ 1 ]
#SELECT CASE a+1 WHEN b THEN 111 WHEN c THEN 222 WHEN d THEN 333 WHEN e THEN
444 ELSE 555 END, CASE WHEN a<b-3 THEN 111 WHEN a<=b THEN 222 WHEN a<b+3 THEN
333 ELSE 444 END, a+b*2+c*3+d*4, a+b*2+c*3, c, CASE WHEN c>(SELECT avg(c) FROM
t1) THEN a*2 ELSE b*10 END, abs(b-c) FROM t1 WHERE EXISTS(SELECT 1 FROM t1 AS x
WHERE x.b<t1.b) OR b>c OR d NOT BETWEEN 110 AND 150 ORDER BY 4,1,5,2,6,3,7;
-% .L1, .L2, .L3, .L4, .t1, .L6, .L7 # table_name
-% L1, L2, L3, L4, c, L6, L7 # name
+% .L16, .L20, .L22, .L24, .t1, .L33, .L35 # table_name
+% L16, L20, L22, L24, c, L33, L35 # name
% smallint, smallint, bigint, bigint, int, bigint, bigint # type
% 3, 3, 4, 3, 3, 4, 1 # length
[ 555, 444, 1014, 610, 102, 1000, 2 ]
@@ -59,8 +59,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 444, 333, 1325, 793, 134, 262, 4 ]
[ 111, 222, 1371, 827, 137, 276, 2 ]
#SELECT a, a+b*2+c*3+d*4+e*5, c-d, CASE WHEN c>(SELECT avg(c) FROM t1) THEN
a*2 ELSE b*10 END, b-c, a+b*2 FROM t1 ORDER BY 6,2,4,5,3,1;
-% sys.t1, sys.L1, sys.L2, sys.L4, sys.L5, sys.L6 # table_name
-% a, L1, L2, L4, L5, L6 # name
+% sys.t1, sys.L3, sys.L5, sys.L13, sys.L15, sys.L17 #
table_name
+% a, L3, L5, L13, L15, L17 # name
% int, bigint, bigint, bigint, bigint, bigint # type
% 3, 4, 2, 4, 2, 3 # length
[ 104, 1529, 1, 1000, -2, 304 ]
@@ -72,8 +72,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 131, 1985, 1, 262, -4, 391 ]
[ 138, 2046, 1, 276, 2, 416 ]
#SELECT a+b*2+c*3+d*4+e*5, CASE WHEN a<b-3 THEN 111 WHEN a<=b THEN 222 WHEN
a<b+3 THEN 333 ELSE 444 END, a, abs(b-c), a+b*2, d, CASE WHEN c>(SELECT avg(c)
FROM t1) THEN a*2 ELSE b*10 END FROM t1 WHERE (e>c OR e<d) OR a>b ORDER BY
4,5,3,7,1,6,2;
-% sys.L1, sys.L2, sys.t1, sys.L3, sys.L4, sys.t1, sys.L6 # table_name
-% L1, L2, a, L3, L4, d, L6 # name
+% sys.L2, sys.L4, sys.t1, sys.L7, sys.L11, sys.t1, sys.L20 #
table_name
+% L2, L4, a, L7, L11, d, L20 # name
% bigint, smallint, int, bigint, bigint, int, bigint # type
% 4, 3, 3, 1, 3, 3, 4 # length
[ 1612, 333, 107, 1, 317, 108, 1050 ]
@@ -84,8 +84,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 1902, 222, 127, 4, 385, 128, 254 ]
[ 1985, 333, 131, 4, 391, 133, 262 ]
#SELECT a, e, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END, a-b
FROM t1 ORDER BY 2,4,3,1;
-% sys.t1, sys.t1, sys.L3, sys.L4 # table_name
-% a, e, L3, L4 # name
+% sys.t1, sys.t1, sys.L10, sys.L12 # table_name
+% a, e, L10, L12 # name
% int, int, bigint, bigint # type
% 3, 3, 4, 2 # length
[ 104, 103, 1000, 4 ]
@@ -97,8 +97,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 131, 132, 262, 1 ]
[ 138, 135, 276, -1 ]
#SELECT d, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END,
abs(b-c), a+b*2+c*3+d*4+e*5, CASE WHEN a<b-3 THEN 111 WHEN a<=b THEN 222 WHEN
a<b+3 THEN 333 ELSE 444 END, d-e FROM t1 ORDER BY 1,6,2,3,5,4;
-% sys.t1, sys.L2, sys.L3, sys.L4, sys.L5, sys.L6 # table_name
-% d, L2, L3, L4, L5, L6 # name
+% sys.t1, sys.L7, sys.L11, sys.L13, sys.L15, sys.L17
# table_name
+% d, L7, L11, L13, L15, L17 # name
% int, bigint, bigint, bigint, smallint, bigint # type
% 3, 4, 1, 4, 3, 2 # length
[ 101, 1000, 2, 1529, 444, -2 ]
@@ -110,26 +110,26 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 133, 262, 4, 1985, 333, 1 ]
[ 136, 276, 2, 2046, 222, 1 ]
#SELECT a+b*2+c*3+d*4+e*5, a, abs(a), a-b, d-e, CASE WHEN c>(SELECT avg(c)
FROM t1) THEN a*2 ELSE b*10 END FROM t1 WHERE EXISTS(SELECT 1 FROM t1 AS x
WHERE x.b<t1.b) AND b>c ORDER BY 4,6,3,1,5,2;
-% sys.L1, sys.t1, sys.L2, sys.L3, sys.L4, sys.L6 # table_name
-% L1, a, L2, L3, L4, L6 # name
+% sys.L4, sys.t1, sys.L7, sys.L11, sys.L13, sys.L21 #
table_name
+% L4, a, L7, L11, L13, L21 # name
% bigint, int, int, bigint, bigint, bigint # type
% 4, 3, 3, 2, 1, 3 # length
[ 1826, 121, 121, -3, 2, 242 ]
[ 1902, 127, 127, -2, 2, 254 ]
[ 2046, 138, 138, -1, 1, 276 ]
#SELECT CASE WHEN a<b-3 THEN 111 WHEN a<=b THEN 222 WHEN a<b+3 THEN 333 ELSE
444 END, a+b*2+c*3+d*4+e*5, a, CASE a+1 WHEN b THEN 111 WHEN c THEN 222 WHEN d
THEN 333 WHEN e THEN 444 ELSE 555 END, CASE WHEN c>(SELECT avg(c) FROM t1)
THEN a*2 ELSE b*10 END, (SELECT count(*) FROM t1 AS x WHERE x.c>t1.c AND
x.d<t1.d), d FROM t1 WHERE a>b AND (e>a AND e<b) ORDER BY 7,2,4,6,1,3,5;
-% .L1, .L2, .t1, .L3, .L5, .L7, .t1 # table_name
-% L1, L2, a, L3, L5, L7, d # name
+% sys.L2, sys.L4, sys.t1, sys.L7, sys.L15, .L21, sys.t1 #
table_name
+% L2, L4, a, L7, L15, L21, d # name
% smallint, bigint, int, smallint, bigint, bigint, int # type
% 1, 1, 1, 1, 1, 1, 1 # length
#SELECT e, (SELECT count(*) FROM t1 AS x WHERE x.b<t1.b), CASE WHEN c>(SELECT
avg(c) FROM t1) THEN a*2 ELSE b*10 END, CASE a+1 WHEN b THEN 111 WHEN c THEN
222 WHEN d THEN 333 WHEN e THEN 444 ELSE 555 END, a-b, (SELECT count(*) FROM
t1 AS x WHERE x.c>t1.c AND x.d<t1.d) FROM t1 WHERE a>b AND (c<=d-2 OR c>=d+2)
AND c>d ORDER BY 6,5,4,2,3,1;
-% .t1, .L2, .L4, .L5, .L6, .L10 # table_name
-% e, L2, L4, L5, L6, L10 # name
+% sys.t1, .L5, sys.L14, sys.L16, sys.L20, .L24 #
table_name
+% e, L5, L14, L16, L20, L24 # name
% int, bigint, bigint, smallint, bigint, bigint # type
% 1, 1, 1, 1, 1, 1 # length
#SELECT b, a-b, c, abs(b-c), d-e, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2
ELSE b*10 END, b-c FROM t1 WHERE EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b)
ORDER BY 1,6,4,5,2,7,3;
-% sys.t1, sys.L1, sys.t1, sys.L2, sys.L3, sys.L5, sys.L6 # table_name
-% b, L1, c, L2, L3, L5, L6 # name
+% sys.t1, sys.L5, sys.t1, sys.L10, sys.L12, sys.L20,
sys.L22 # table_name
+% b, L5, c, L10, L12, L20, L22 # name
% int, bigint, int, bigint, bigint, bigint, bigint # type
% 3, 2, 3, 1, 2, 4, 2 # length
[ 105, 2, 106, 1, -1, 1050, -1 ]
@@ -140,16 +140,16 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 130, 1, 134, 4, 1, 262, -4 ]
[ 139, -1, 137, 2, 1, 276, 2 ]
#SELECT (SELECT count(*) FROM t1 AS x WHERE x.c>t1.c AND x.d<t1.d), b, a,
a+b*2+c*3+d*4+e*5, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END,
CASE a+1 WHEN b THEN 111 WHEN c THEN 222 WHEN d THEN 333 WHEN e THEN 444 ELSE
555 END, a+b*2+c*3 FROM t1 WHERE a>b AND (e>c OR e<d) ORDER BY 3,7,2,5,6,4,1;
-% .L1, .t1, .t1, .L2, .L4, .L5, .L6 # table_name
-% L1, b, a, L2, L4, L5, L6 # name
+% .L4, sys.t1, sys.t1, sys.L10, sys.L17, sys.L21, sys.L23
# table_name
+% L4, b, a, L10, L17, L21, L23 # name
% bigint, int, int, bigint, bigint, smallint, bigint # type
% 1, 3, 3, 4, 4, 3, 3 # length
[ 0, 100, 104, 1529, 1000, 555, 610 ]
[ 0, 105, 107, 1612, 1050, 333, 635 ]
[ 0, 130, 131, 1985, 262, 444, 793 ]
#SELECT c-d, a-b, b, b-c, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE
b*10 END, c, a+b*2 FROM t1 ORDER BY 1,5,4,3,2,6,7;
-% sys.L1, sys.L2, sys.t1, sys.L3, sys.L5, sys.t1, sys.L6 # table_name
-% L1, L2, b, L3, L5, c, L6 # name
+% sys.L2, sys.L4, sys.t1, sys.L7, sys.L15, sys.t1, sys.L20 #
table_name
+% L2, L4, b, L7, L15, c, L20 # name
% bigint, bigint, int, bigint, bigint, int, bigint # type
% 2, 2, 3, 2, 4, 3, 3 # length
[ -3, -2, 129, 4, 254, 125, 385 ]
@@ -161,8 +161,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 1, 4, 100, -2, 1000, 102, 304 ]
[ 3, -3, 118, -1, 1180, 119, 351 ]
#SELECT a+b*2+c*3+d*4, a, c-d, abs(b-c), b, CASE WHEN c>(SELECT avg(c) FROM
t1) THEN a*2 ELSE b*10 END FROM t1 WHERE (e>c OR e<d) OR (c<=d-2 OR c>=d+2)
ORDER BY 4,3,2,5,1,6;
-% sys.L1, sys.t1, sys.L2, sys.L3, sys.t1, sys.L5 # table_name
-% L1, a, L2, L3, b, L5 # name
+% sys.L2, sys.t1, sys.L5, sys.L7, sys.t1, sys.L16 # table_name
+% L2, a, L5, L7, b, L16 # name
% bigint, int, bigint, bigint, int, bigint # type
% 4, 3, 2, 1, 3, 4 # length
[ 1067, 107, -2, 1, 105, 1050 ]
@@ -174,8 +174,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 1272, 127, -3, 4, 129, 254 ]
[ 1325, 131, 1, 4, 130, 262 ]
#SELECT a, a+b*2+c*3+d*4+e*5, b, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2
ELSE b*10 END, e, a-b FROM t1 ORDER BY 1,4,5,3,6,2;
-% sys.t1, sys.L1, sys.t1, sys.L3, sys.t1, sys.L4 # table_name
-% a, L1, b, L3, e, L4 # name
+% sys.t1, sys.L3, sys.t1, sys.L12, sys.t1, sys.L15 # table_name
+% a, L3, b, L12, e, L15 # name
% int, bigint, int, bigint, int, bigint # type
% 3, 4, 3, 4, 3, 2 # length
[ 104, 1529, 100, 1000, 103, 4 ]
@@ -187,8 +187,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 131, 1985, 130, 262, 132, 1 ]
[ 138, 2046, 139, 276, 135, -1 ]
#SELECT d, d-e, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END,
a+b*2, a+b*2+c*3+d*4+e*5, CASE WHEN a<b-3 THEN 111 WHEN a<=b THEN 222 WHEN
a<b+3 THEN 333 ELSE 444 END, a+b*2+c*3 FROM t1 ORDER BY 3,2,4,5,7,1,6;
-% sys.t1, sys.L1, sys.L3, sys.L4, sys.L5, sys.L6, sys.L7 # table_name
-% d, L1, L3, L4, L5, L6, L7 # name
+% sys.t1, sys.L3, sys.L11, sys.L13, sys.L15,
sys.L17, sys.L21 # table_name
+% d, L3, L11, L13, L15, L17, L21 # name
% int, bigint, bigint, bigint, bigint, smallint, bigint # type
% 3, 2, 4, 3, 4, 3, 3 # length
[ 122, 2, 242, 369, 1826, 222, 738 ]
@@ -200,8 +200,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 114, 4, 1120, 335, 1680, 222, 674 ]
[ 116, -1, 1180, 351, 1757, 222, 708 ]
#SELECT a, CASE WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END, (SELECT
count(*) FROM t1 AS x WHERE x.c>t1.c AND x.d<t1.d), a+b*2+c*3+d*4, b FROM t1
WHERE c>d OR d>e ORDER BY 2,5,1,3,4;
-% .t1, .L2, .L4, .L5, .t1 # table_name
-% a, L2, L4, L5, b # name
+% sys.t1, sys.L7, .L13, sys.L15, sys.t1 # table_name
+% a, L7, L13, L15, b # name
% int, bigint, bigint, bigint, int # type
% 3, 4, 1, 4, 3 # length
[ 121, 242, 0, 1226, 124 ]
@@ -212,8 +212,8 @@ stdout of test 'ambiguous.Bug-3803` in d
[ 111, 1120, 0, 1130, 112 ]
[ 115, 1180, 0, 1172, 118 ]
#SELECT c, (SELECT count(*) FROM t1 AS x WHERE x.c>t1.c AND x.d<t1.d), CASE
WHEN c>(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END, a+b*2+c*3+d*4 FROM t1
WHERE b>c OR (e>c OR e<d) OR d NOT BETWEEN 110 AND 150 ORDER BY 3,2,1,4;
-% .t1, .L2, .L4, .L5 # table_name
-% c, L2, L4, L5 # name
+% sys.t1, .L5, sys.L14, sys.L16 # table_name
+% c, L5, L14, L16 # name
% int, bigint, bigint, bigint # type
% 3, 1, 4, 4 # length
[ 123, 0, 242, 1226 ]
diff --git a/sql/test/mapi/Tests/perl_dbi.stable.out
b/sql/test/mapi/Tests/perl_dbi.stable.out
--- a/sql/test/mapi/Tests/perl_dbi.stable.out
+++ b/sql/test/mapi/Tests/perl_dbi.stable.out
@@ -33,7 +33,7 @@ Start a simple Monet SQL interaction
data sources: dbi:monetdb:
field[0]: 2, last index: 0
field[0]: 3, last index: 0
-ERROR REPORTED: DBD::monetdb::st execute failed: 42000!syntax error,
unexpected IDENT, expecting SELECT or '(' in: "( xyz" at
/ufs/sjoerd/.local/share/perl5/MonetDB/CLI/MapiPP.pm line 123.
+ERROR REPORTED: DBD::monetdb::st execute failed: 42000!syntax error,
unexpected IDENT, expecting SELECT or '(' or VALUES in: "( xyz" at
/usr/share/perl5/vendor_perl/MonetDB/CLI/MapiPP.pm line 123.
bun: 3, three
bun: 7, seven
rows: 2, fields: 2
diff --git a/sql/test/mapi/Tests/python2_dbapi.stable.out
b/sql/test/mapi/Tests/python2_dbapi.stable.out
--- a/sql/test/mapi/Tests/python2_dbapi.stable.out
+++ b/sql/test/mapi/Tests/python2_dbapi.stable.out
@@ -30,7 +30,7 @@ stdout of test 'python2_dbapi` in direct
[(1,)]
(2,)
-42000!syntax error, unexpected IDENT, expecting SELECT or '(' in: "( xyz"
+42000!syntax error, unexpected IDENT, expecting SELECT or '(' or VALUES in: "(
xyz"
[(3, u'three'), (7, u'seven')]
2
diff --git a/sql/test/mapi/Tests/python3_dbapi.stable.out
b/sql/test/mapi/Tests/python3_dbapi.stable.out
--- a/sql/test/mapi/Tests/python3_dbapi.stable.out
+++ b/sql/test/mapi/Tests/python3_dbapi.stable.out
@@ -30,7 +30,7 @@ stdout of test 'python3_dbapi` in direct
[(1,)]
(2,)
-42000!syntax error, unexpected IDENT, expecting SELECT or '(' in: "( xyz"
+42000!syntax error, unexpected IDENT, expecting SELECT or '(' or VALUES in: "(
xyz"
[(3, 'three'), (7, 'seven')]
2
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
