Changeset: 98036860e94b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98036860e94b
Modified Files:
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/pg_regress/Tests/float4.stable.out
Branch: default
Log Message:
Approvals.
diffs (truncated from 468 to 300 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -129,7 +129,7 @@ top N (
% mal # name
% clob # type
% 82 # length
-function user.s4_1{autoCommit=true}():void;
+function user.s7_1{autoCommit=true}():void;
X_23:void := querylog.define("explain select * from
oblo;","minimal_pipe",14);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -142,13 +142,13 @@ function user.s4_1{autoCommit=true}():vo
sql.rsColumn(X_16,"sys.oblo","a","int",32,0,X_15);
X_21 := io.stdout();
sql.exportResult(X_21,X_16);
-end user.s4_1;
+end user.s7_1;
#EXPLAIN select * from oblo OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 91 # length
-function user.s5_1{autoCommit=true}():void;
+function user.s8_1{autoCommit=true}():void;
X_31:void := querylog.define("explain select * from oblo offset
2;","minimal_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -167,13 +167,13 @@ function user.s5_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s5_1;
+end user.s8_1;
#EXPLAIN select * from oblo LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 90 # length
-function user.s6_1{autoCommit=true}():void;
+function user.s9_1{autoCommit=true}():void;
X_31:void := querylog.define("explain select * from oblo limit
2;","minimal_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -192,13 +192,13 @@ function user.s6_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s6_1;
+end user.s9_1;
#EXPLAIN select * from oblo LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 99 # length
-function user.s7_1{autoCommit=true}():void;
+function user.s10_1{autoCommit=true}():void;
X_31:void := querylog.define("explain select * from oblo limit 1 offset
2;","minimal_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -217,13 +217,13 @@ function user.s7_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s7_1;
+end user.s10_1;
#EXPLAIN select * from oblo LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 99 # length
-function user.s8_1{autoCommit=true}():void;
+function user.s11_1{autoCommit=true}():void;
X_31:void := querylog.define("explain select * from oblo limit 2 offset
1;","minimal_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -242,13 +242,13 @@ function user.s8_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s8_1;
+end user.s11_1;
#EXPLAIN select * from oblo ORDER BY a;
% .explain # table_name
% mal # name
% clob # type
% 93 # length
-function user.s9_1{autoCommit=true}():void;
+function user.s12_1{autoCommit=true}():void;
X_28:void := querylog.define("explain select * from oblo order by
a;","minimal_pipe",16);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -263,13 +263,13 @@ function user.s9_1{autoCommit=true}():vo
sql.rsColumn(X_21,"sys.oblo","a","int",32,0,X_20);
X_26 := io.stdout();
sql.exportResult(X_26,X_21);
-end user.s9_1;
+end user.s12_1;
#EXPLAIN select * from oblo ORDER BY a OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 102 # length
-function user.s10_1{autoCommit=true}():void;
+function user.s13_1{autoCommit=true}():void;
X_36:void := querylog.define("explain select * from oblo order by a
offset 2;","minimal_pipe",22);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -290,13 +290,13 @@ function user.s10_1{autoCommit=true}():v
sql.rsColumn(X_29,"sys.oblo","a","int",32,0,X_28);
X_34 := io.stdout();
sql.exportResult(X_34,X_29);
-end user.s10_1;
+end user.s13_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 101 # length
-function user.s11_1{autoCommit=true}():void;
+function user.s14_1{autoCommit=true}():void;
X_41:void := querylog.define("explain select * from oblo order by a limit
2;","minimal_pipe",27);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -322,13 +322,13 @@ function user.s11_1{autoCommit=true}():v
sql.rsColumn(X_34,"sys.oblo","a","int",32,0,X_33);
X_39 := io.stdout();
sql.exportResult(X_39,X_34);
-end user.s11_1;
+end user.s14_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 110 # length
-function user.s12_1{autoCommit=true}():void;
+function user.s15_1{autoCommit=true}():void;
X_46:void := querylog.define("explain select * from oblo order by a limit
2 offset 1;","minimal_pipe",29);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -356,13 +356,13 @@ function user.s12_1{autoCommit=true}():v
sql.rsColumn(X_37,"sys.oblo","a","int",32,0,X_36);
X_44 := io.stdout();
sql.exportResult(X_44,X_37);
-end user.s12_1;
+end user.s15_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 110 # length
-function user.s13_1{autoCommit=true}():void;
+function user.s16_1{autoCommit=true}():void;
X_46:void := querylog.define("explain select * from oblo order by a limit
1 offset 2;","minimal_pipe",29);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","oblo");
@@ -390,7 +390,7 @@ function user.s13_1{autoCommit=true}():v
sql.rsColumn(X_37,"sys.oblo","a","int",32,0,X_36);
X_44 := io.stdout();
sql.exportResult(X_44,X_37);
-end user.s13_1;
+end user.s16_1;
#select * from oblo;
% sys.oblo # table_name
% a # name
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -39,7 +39,7 @@ Ready.
% mal # name
% clob # type
% 113 # length
-function user.s5_1{autoCommit=true}():void;
+function user.s7_1{autoCommit=true}():void;
X_50:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",28);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","t2564");
@@ -66,7 +66,7 @@ function user.s5_1{autoCommit=true}():vo
sql.rsColumn(X_41,"sys.L1","L1","wrd",64,0,X_39);
X_48 := io.stdout();
sql.exportResult(X_48,X_41);
-end user.s5_1;
+end user.s7_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.L1 # table_name
% L1 # name
diff --git
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
---
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
+++
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
@@ -28,9 +28,6 @@ stderr of test 'varchar_conversion_crash
# 18:58:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28742" "--port=38663"
# 18:58:33 >
-MAPI = (monetdb) /var/tmp/mtest-28742/.s.monetdb.38663
-QUERY = INSERT INTO config (dataset, section, key, value, type) VALUES (6,
'quality_lofar', 'high_bound', 80, 'int');
-ERROR = !EXEC: wrong type for argument 4 of prepared statement: decimal,
expected decimal
# 18:58:33 >
# 18:58:33 > "Done."
diff --git
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
---
a/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
+++
b/sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
@@ -28,12 +28,15 @@ Ready.
#CREATE TABLE config (id SERIAL ,dataset INT NOT NULL ,section VARCHAR(100)
,key VARCHAR(100) ,value VARCHAR(500) ,type VARCHAR(5) ,UNIQUE (dataset,
section, key)) ;
#INSERT INTO config (dataset, section, key, value, type) VALUES (6,
'quality_lofar', 'low_bound', 1.9, 'float');
[ 1 ]
+#INSERT INTO config (dataset, section, key, value, type) VALUES (6,
'quality_lofar', 'high_bound', 80, 'int');
+[ 1 ]
#select * from config;
% sys.config, sys.config, sys.config, sys.config, sys.config,
sys.config # table_name
% id, dataset, section, key, value, type # name
% int, int, varchar, varchar, varchar, varchar # type
-% 1, 1, 13, 9, 3, 5 # length
+% 1, 1, 13, 10, 3, 5 # length
[ 1, 6, "quality_lofar", "low_bound", "1.9", "float" ]
+[ 2, 6, "quality_lofar", "high_bound", "80", "int" ]
#drop table config;
# 18:58:33 >
diff --git a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
--- a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
+++ b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
@@ -109,7 +109,7 @@ Ready.
% .L # table_name
% single_value # name
% char # type
-% 31 # length
+% 15 # length
[ "dropping kwTemp" ]
#DROP TABLE kwTemp;
#COMMIT;
@@ -131,7 +131,7 @@ Ready.
% .L # table_name
% single_value # name
% char # type
-% 27 # length
+% 16 # length
[ "dropping kwmTemp" ]
#DROP TABLE kwmTemp;
#COMMIT;
diff --git a/sql/test/Skyserver/Tests/Skyserver.stable.out
b/sql/test/Skyserver/Tests/Skyserver.stable.out
--- a/sql/test/Skyserver/Tests/Skyserver.stable.out
+++ b/sql/test/Skyserver/Tests/Skyserver.stable.out
@@ -121,7 +121,7 @@ tables
% .L # table_name
% single_value # name
% char # type
-% 14 # length
+% 8 # length
[ "ALL DONE" ]
views
functions
diff --git
a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
--- a/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
+++ b/sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
@@ -35,7 +35,7 @@ Ready.
% .L # table_name
% single_value # name
% char # type
-% 128 # length
+% 22 # length
[ "SAVE 25ยข ON ICE CREAM" ]
# 12:55:03 >
diff --git a/sql/test/pg_regress/Tests/float4.stable.out
b/sql/test/pg_regress/Tests/float4.stable.out
--- a/sql/test/pg_regress/Tests/float4.stable.out
+++ b/sql/test/pg_regress/Tests/float4.stable.out
@@ -80,12 +80,12 @@ Ready.
% char, real # type
% 0, 15 # length
[ "", 0 ]
-[ "", 1004.29999 ]
-[ "", -34.8400002 ]
-[ "", 1.2345679e+20 ]
-[ "", 1.23456787e-20 ]
-[ "", 1.00000022e-39 ]
-[ "", -1.00000022e-39 ]
+[ "", 1004.3 ]
+[ "", -34.84 ]
+[ "", 1.2346e+20 ]
+[ "", 1.2346e-20 ]
+[ "", 1e-39 ]
+[ "", -1e-39 ]
[ "", 0 ]
#SELECT '' AS four, f.* FROM FLOAT4_TBL f WHERE f.f1 <> '1004.3';
% .L, sys.f # table_name
@@ -93,28 +93,28 @@ Ready.
% char, real # type
% 0, 15 # length
[ "", 0 ]
-[ "", -34.8400002 ]
-[ "", 1.2345679e+20 ]
-[ "", 1.23456787e-20 ]
-[ "", 1.00000022e-39 ]
-[ "", -1.00000022e-39 ]
+[ "", -34.84 ]
+[ "", 1.2346e+20 ]
+[ "", 1.2346e-20 ]
+[ "", 1e-39 ]
+[ "", -1e-39 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
