Changeset: 727679829446 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=727679829446
Modified Files:
sql/test/miscellaneous/Tests/simple_plans.stable.out.single
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.out
Branch: default
Log Message:
Approved output
diffs (159 lines):
diff --git a/sql/test/miscellaneous/Tests/simple_plans.stable.out.single
b/sql/test/miscellaneous/Tests/simple_plans.stable.out.single
--- a/sql/test/miscellaneous/Tests/simple_plans.stable.out.single
+++ b/sql/test/miscellaneous/Tests/simple_plans.stable.out.single
@@ -188,8 +188,8 @@ project (
% 166 # length
function user.s24_0():void;
X_2:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 between t2.col1 and t2.col1;":str, "default_pipe":str,
23:int);
- X_32:bat[:str] := bat.pack(".%3":str);
- X_33:bat[:str] := bat.pack("%3":str);
+ X_32:bat[:str] := bat.pack(".%5":str);
+ X_33:bat[:str] := bat.pack("%5":str);
X_34:bat[:str] := bat.pack("tinyint":str);
X_35:bat[:int] := bat.pack(1:int);
X_36:bat[:int] := bat.pack(0:int);
@@ -237,8 +237,8 @@ end user.s24_0;
% 174 # length
function user.s26_0():void;
X_4:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 between t2.col1 - 1 and t2.col1 + 1;":str,
"default_pipe":str, 35:int);
- X_49:bat[:str] := bat.pack(".%12":str);
- X_50:bat[:str] := bat.pack("%12":str);
+ X_49:bat[:str] := bat.pack(".%14":str);
+ X_50:bat[:str] := bat.pack("%14":str);
X_51:bat[:str] := bat.pack("tinyint":str);
X_52:bat[:int] := bat.pack(1:int);
X_53:bat[:int] := bat.pack(0:int);
@@ -289,8 +289,8 @@ end user.s26_0;
% 160 # length
function user.s28_0():void;
X_3:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 between t2.col1 and 2;":str, "default_pipe":str,
26:int);
- X_36:bat[:str] := bat.pack(".%3":str);
- X_37:bat[:str] := bat.pack("%3":str);
+ X_36:bat[:str] := bat.pack(".%5":str);
+ X_37:bat[:str] := bat.pack("%5":str);
X_38:bat[:str] := bat.pack("tinyint":str);
X_39:bat[:int] := bat.pack(1:int);
X_40:bat[:int] := bat.pack(0:int);
@@ -339,8 +339,8 @@ end user.s28_0;
% 189 # length
function user.s30_0():void;
X_2:void := querylog.define("explain select 1 from tbl_productsales t1
inner join tbl_productsales t2 on t1.product_category like
t2.product_category;":str, "default_pipe":str, 24:int);
- X_32:bat[:str] := bat.pack(".%3":str);
- X_33:bat[:str] := bat.pack("%3":str);
+ X_32:bat[:str] := bat.pack(".%5":str);
+ X_33:bat[:str] := bat.pack("%5":str);
X_34:bat[:str] := bat.pack("tinyint":str);
X_35:bat[:int] := bat.pack(1:int);
X_36:bat[:int] := bat.pack(0:int);
@@ -388,8 +388,8 @@ end user.s30_0;
% 148 # length
function user.s32_0():void;
X_2:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 > t2.col1;":str, "default_pipe":str, 23:int);
- X_30:bat[:str] := bat.pack(".%3":str);
- X_31:bat[:str] := bat.pack("%3":str);
+ X_30:bat[:str] := bat.pack(".%5":str);
+ X_31:bat[:str] := bat.pack("%5":str);
X_32:bat[:str] := bat.pack("tinyint":str);
X_33:bat[:int] := bat.pack(1:int);
X_34:bat[:int] := bat.pack(0:int);
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
@@ -54,7 +54,11 @@ MAPI = (monetdb) /var/tmp/mtest-3604/.s
QUERY = SELECT cast('10 years -11 month -12 days +13:14' as interval second)
AS "9 years...";
ERROR = !Wrong format (10 years -11 month -12 days +13:14)
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
+QUERY = INSERT INTO INTERVAL_TBL (f1) VALUES (60 * 60 * 24 * 365 * 2014);
+ERROR = !types bigint(37,0) and sec_interval(13,0) are not equal
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
QUERY = INSERT INTO INTERVAL_TBL (f1) VALUES ('123456789012345678');
ERROR = !Wrong format (123456789012345678)
CODE = 42000
@@ -144,7 +148,19 @@ QUERY = SELECT '' AS nine, INTERVAL_TBL.
WHERE INTERVAL_TBL.f1 > cast('@ 3 seconds ago' as interval second);
ERROR = !Wrong format (@ 3 seconds ago)
CODE = 42000
-MAPI = (monetdb) /var/tmp/mtest-45764/.s.monetdb.39324
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
+QUERY = select avg(f1) from interval_tbl;
+ERROR = !types sec_interval(13,0) and month_interval(32,0) are not equal for
column 'f1'
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
+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
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
+QUERY = select avg(cast(f1 as decimal)) from interval_tbl;
+ERROR = !types sec_interval(13,0) and decimal(18,3) are not equal for column
'f1'
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-149583/.s.monetdb.38425
QUERY = select avg(cast(f1 as decimal(22,3))) from interval_tbl;
ERROR = !Decimal(22,3) isn't supported because P=22 > 18 in: "select
avg(cast(f1 as decimal(22,3)"
!syntax error, unexpected ')' in: ")"
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
@@ -46,33 +46,13 @@ stdout of test 'interval` in directory '
% ., sys.r1, sys.r2 # table_name
% fortyfive, f1, f1 # name
% char, sec_interval, sec_interval # type
-% 0, 15, 5 # length
-[ "", 63513504000.000, 1.234 ]
+% 0, 5, 5 # length
#SELECT '' AS ten, INTERVAL_TBL.* FROM INTERVAL_TBL order by f1 desc;
% ., sys.interval_tbl # table_name
% ten, f1 # name
% char, sec_interval # type
-% 0, 15 # length
-[ "", 63513504000.000 ]
+% 0, 5 # length
[ "", 1.234 ]
-#select avg(f1) from interval_tbl;
-% sys.%1 # table_name
-% %1 # name
-% double # type
-% 24 # length
-[ 3.175675085e+10 ]
-#select avg(cast(f1 as double)) from interval_tbl;
-% sys.%2 # table_name
-% %2 # name
-% double # type
-% 24 # length
-[ 3.1756752e+10 ]
-#select avg(cast(f1 as decimal)) from interval_tbl;
-% sys.%2 # table_name
-% %2 # name
-% double # type
-% 24 # length
-[ 3.1756752e+10 ]
#select min(f1) from interval_tbl;
% sys.%1 # table_name
% %1 # name
@@ -83,20 +63,20 @@ stdout of test 'interval` in directory '
% sys.%1 # table_name
% %1 # name
% sec_interval # type
-% 15 # length
-[ 63513504000.000 ]
+% 5 # length
+[ 1.234 ]
#select count(f1) from interval_tbl;
% sys.%1 # table_name
% %1 # name
% bigint # type
% 1 # length
-[ 2 ]
+[ 1 ]
#select count(distinct f1) from interval_tbl;
% sys.%1 # table_name
% %1 # name
% bigint # type
% 1 # length
-[ 2 ]
+[ 1 ]
#DROP TABLE INTERVAL_TBL;
# 12:56:40 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
