Changeset: 22120f327102 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22120f327102
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/rest/Tests/jsonstore00.stable.out
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/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/Tests/decimal2.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
Branch: default
Log Message:
approved tests
diffs (truncated from 357 to 300 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -44,11 +44,11 @@ end user.s2_1;
% mal # name
% clob # type
% 88 # length
-function user.s4_1{autoCommit=true}(A0:sht,A1:sht):void;
+function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
X_14:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".L","fuse_single_value","int",32,0,7,X_4,"");
-end user.s4_1;
+end user.s3_1;
#select fuse(1000,2000);
% .L # table_name
% fuse_single_value # name
@@ -60,11 +60,11 @@ end user.s4_1;
% mal # name
% clob # type
% 94 # length
-function user.s6_1{autoCommit=true}(A0:int,A1:int):void;
+function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
X_14:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".L","fuse_single_value","bigint",64,0,7,X_4,"");
-end user.s6_1;
+end user.s4_1;
#select fuse(1000000,2000000);
% .L # table_name
% fuse_single_value # name
@@ -94,7 +94,7 @@ end user.s6_1;
% mal # name
% clob # type
% 97 # length
-function user.s14_1{autoCommit=true}():void;
+function user.s8_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -113,13 +113,13 @@ function user.s14_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.L","fuse_a","smallint",16,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s14_1;
+end user.s8_1;
#explain select fuse(c,d) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s15_1{autoCommit=true}():void;
+function user.s9_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -138,13 +138,13 @@ function user.s15_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.L","fuse_c","int",32,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s15_1;
+end user.s9_1;
#explain select fuse(e,f) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s16_1{autoCommit=true}():void;
+function user.s10_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -163,7 +163,7 @@ function user.s16_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.L","fuse_e","bigint",64,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s16_1;
+end user.s10_1;
#select fuse(a,b) from udf_fuse;
% sys.L # table_name
% fuse_a # name
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -83,7 +83,7 @@ end user.s2_1;
% mal # name
% clob # type
% 101 # length
-function user.s10_1{autoCommit=true}():void;
+function user.s6_1{autoCommit=true}():void;
X_24:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",15);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_reverse");
@@ -97,7 +97,7 @@ function user.s10_1{autoCommit=true}():v
sql.rsColumn(X_17,"sys.L","reverse_x","clob",0,0,X_16);
X_22 := io.stdout();
sql.exportResult(X_22,X_17);
-end user.s10_1;
+end user.s6_1;
#select reverse(x) from udf_reverse;
% sys.L # table_name
% reverse_x # name
diff --git a/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
--- a/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
+++ b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
@@ -182,7 +182,7 @@ Ready.
% .L # table_name
% error # name
% char # type
-% 20 # length
+% 21 # length
[ "No Parameter Allowed" ]
#SELECT 'Missing Attachment PATH' AS error;
% .L # table_name
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.s7_1{autoCommit=true}():void;
+function user.s4_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.s7_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.s7_1;
+end user.s4_1;
#EXPLAIN select * from oblo OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 91 # length
-function user.s8_1{autoCommit=true}():void;
+function user.s5_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.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.s5_1;
#EXPLAIN select * from oblo LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 90 # length
-function user.s9_1{autoCommit=true}():void;
+function user.s6_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.s9_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.s9_1;
+end user.s6_1;
#EXPLAIN select * from oblo LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 99 # length
-function user.s10_1{autoCommit=true}():void;
+function user.s7_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.s10_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s10_1;
+end user.s7_1;
#EXPLAIN select * from oblo LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 99 # length
-function user.s11_1{autoCommit=true}():void;
+function user.s8_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.s11_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.oblo","a","int",32,0,X_23);
X_29 := io.stdout();
sql.exportResult(X_29,X_24);
-end user.s11_1;
+end user.s8_1;
#EXPLAIN select * from oblo ORDER BY a;
% .explain # table_name
% mal # name
% clob # type
% 93 # length
-function user.s12_1{autoCommit=true}():void;
+function user.s9_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.s12_1{autoCommit=true}():v
sql.rsColumn(X_21,"sys.oblo","a","int",32,0,X_20);
X_26 := io.stdout();
sql.exportResult(X_26,X_21);
-end user.s12_1;
+end user.s9_1;
#EXPLAIN select * from oblo ORDER BY a OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 102 # length
-function user.s13_1{autoCommit=true}():void;
+function user.s10_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.s13_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.s13_1;
+end user.s10_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 101 # length
-function user.s14_1{autoCommit=true}():void;
+function user.s11_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.s14_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.s14_1;
+end user.s11_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 110 # length
-function user.s15_1{autoCommit=true}():void;
+function user.s12_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.s15_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.s15_1;
+end user.s12_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 110 # length
-function user.s16_1{autoCommit=true}():void;
+function user.s13_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.s16_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.s16_1;
+end user.s13_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.s7_1{autoCommit=true}():void;
+function user.s5_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.s7_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.s7_1;
+end user.s5_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.L1 # table_name
% L1 # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
