Changeset: 7538201b0b50 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7538201b0b50 Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.err.int128 sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/interval.stable.out.int128 Branch: Apr2019 Log Message:
Approved output diffs (128 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -25,7 +25,7 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.system order by s.name, f.name, f.id, a.number; -% sys.L17, sys.L21, sys.L23, sys.L25, sys.L27 # table_name +% sys.L2, sys.L4, sys.L6, sys.L10, sys.L12 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 8, 24, 2, 14, 705 # length @@ -210,6 +210,10 @@ Ready. [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "real", "" ] [ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "month_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "sec_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "double", "" ] [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "tinyint", "" ] @@ -220,6 +224,10 @@ Ready. [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "bigint", "" ] [ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "month_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "sec_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "real", "" ] [ "sys", "bbp", 0, "int", "create function sys.bbp ()\n returns table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt int,\n location string, heat int, dirty string,\n status string, kind string)\n external name bbp.get;" ] [ "sys", "bbp", 1, "clob", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -25,7 +25,7 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.system order by s.name, f.name, f.id, a.number; -% sys.L17, sys.L21, sys.L23, sys.L25, sys.L27 # table_name +% sys.L2, sys.L4, sys.L6, sys.L10, sys.L12 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type % 8, 24, 2, 14, 705 # length @@ -219,6 +219,10 @@ Ready. [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "real", "" ] [ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "month_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "sec_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "double", "" ] [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "tinyint", "" ] @@ -231,6 +235,10 @@ Ready. [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "hugeint", "" ] [ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "month_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] +[ "sys", "avg", 1, "sec_interval", "" ] +[ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "real", "" ] [ "sys", "bbp", 0, "int", "create function sys.bbp ()\n returns table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt int,\n location string, heat int, dirty string,\n status string, kind string)\n external name bbp.get;" ] [ "sys", "bbp", 1, "clob", "" ] diff --git a/sql/test/pg_regress/Tests/interval.stable.err b/sql/test/pg_regress/Tests/interval.stable.err --- a/sql/test/pg_regress/Tests/interval.stable.err +++ b/sql/test/pg_regress/Tests/interval.stable.err @@ -145,10 +145,6 @@ QUERY = SELECT '' AS nine, INTERVAL_TBL. ERROR = !Wrong format (@ 3 seconds ago) CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 -QUERY = select avg(f1) from interval_tbl; -ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column 'f1' -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433 QUERY = select avg(cast(f1 as double)) from interval_tbl; ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column 'f1' CODE = 42000 diff --git a/sql/test/pg_regress/Tests/interval.stable.err.int128 b/sql/test/pg_regress/Tests/interval.stable.err.int128 --- a/sql/test/pg_regress/Tests/interval.stable.err.int128 +++ b/sql/test/pg_regress/Tests/interval.stable.err.int128 @@ -145,10 +145,6 @@ QUERY = SELECT '' AS nine, INTERVAL_TBL. ERROR = !Wrong format (@ 3 seconds ago) CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = select avg(f1) from interval_tbl; -ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column 'f1' -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 QUERY = select avg(cast(f1 as double)) from interval_tbl; ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column 'f1' CODE = 42000 diff --git a/sql/test/pg_regress/Tests/interval.stable.out b/sql/test/pg_regress/Tests/interval.stable.out --- a/sql/test/pg_regress/Tests/interval.stable.out +++ b/sql/test/pg_regress/Tests/interval.stable.out @@ -59,6 +59,12 @@ Ready. % 0, 15 # length [ "", 63513504000.000 ] [ "", 1.234 ] +#select avg(f1) from interval_tbl; +% sys.L3 # table_name +% L3 # name +% double # type +% 24 # length +[ 3.1756752e+13 ] #select avg(cast(f1 as decimal)) from interval_tbl; % sys.L5 # table_name % L4 # name diff --git a/sql/test/pg_regress/Tests/interval.stable.out.int128 b/sql/test/pg_regress/Tests/interval.stable.out.int128 --- a/sql/test/pg_regress/Tests/interval.stable.out.int128 +++ b/sql/test/pg_regress/Tests/interval.stable.out.int128 @@ -59,6 +59,12 @@ Ready. % 0, 15 # length [ "", 63513504000.000 ] [ "", 1.234 ] +#select avg(f1) from interval_tbl; +% sys.L3 # table_name +% L3 # name +% double # type +% 24 # length +[ 3.1756752e+13 ] #select avg(cast(f1 as decimal)) from interval_tbl; % sys.L4 # table_name % L4 # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
