Changeset: 5b0867026492 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b0867026492 Modified Files: sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/time.sql sql/test/pg_regress/Tests/time.stable.out sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamp.stable.out sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/pg_regress/Tests/timetz.sql sql/test/pg_regress/Tests/timetz.stable.out Branch: Oct2020 Log Message:
Approved output diffs (200 lines): diff --git a/sql/test/pg_regress/Tests/date.stable.err b/sql/test/pg_regress/Tests/date.stable.err --- a/sql/test/pg_regress/Tests/date.stable.err +++ b/sql/test/pg_regress/Tests/date.stable.err @@ -53,11 +53,7 @@ MAPI = (monetdb) /var/tmp/mtest-11056/. QUERY = SELECT f1, extract(millennium from f1) FROM DATE_TBL; ERROR = !syntax error, unexpected IDENT in: "select f1, extract(millennium" CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT f1, extract(epoch from f1) FROM DATE_TBL; -ERROR = !syntax error, unexpected IDENT in: "select f1, extract(epoch" -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 +MAPI = (monetdb) /var/tmp/mtest-57906/.s.monetdb.30461 QUERY = SELECT f1, hour(f1) FROM DATE_TBL; ERROR = !syntax error, unexpected HOUR in: "select f1, hour" CODE = 42000 diff --git a/sql/test/pg_regress/Tests/date.stable.out b/sql/test/pg_regress/Tests/date.stable.out --- a/sql/test/pg_regress/Tests/date.stable.out +++ b/sql/test/pg_regress/Tests/date.stable.out @@ -292,6 +292,27 @@ stdout of test 'date` in directory 'sql/ [ 2039-04-09, 21 ] [ 2040-04-10, 21 ] [ NULL, NULL ] +#SELECT f1, extract(epoch from f1) FROM DATE_TBL; +% sys.date_tbl, sys.%1 # table_name +% f1, %1 # name +% date, bigint # type +% 10, 13 # length +[ 1957-04-09, -401760000000 ] +[ 1957-06-13, -396144000000 ] +[ 1996-02-28, 825465600000 ] +[ 1996-02-29, 825552000000 ] +[ 1996-03-01, 825638400000 ] +[ 1996-03-02, 825724800000 ] +[ 1997-02-28, 857088000000 ] +[ 1997-03-01, 857174400000 ] +[ 1997-03-02, 857260800000 ] +[ 2000-04-01, 954547200000 ] +[ 2000-04-02, 954633600000 ] +[ 2000-04-03, 954720000000 ] +[ 2038-04-08, 2154297600000 ] +[ 2039-04-09, 2185920000000 ] +[ 2040-04-10, 2217628800000 ] +[ NULL, NULL ] #SELECT f1, week(f1) FROM DATE_TBL; % sys.date_tbl, sys.%1 # table_name % f1, %1 # name diff --git a/sql/test/pg_regress/Tests/time.sql b/sql/test/pg_regress/Tests/time.sql --- a/sql/test/pg_regress/Tests/time.sql +++ b/sql/test/pg_regress/Tests/time.sql @@ -59,6 +59,7 @@ SELECT f1, extract(day from f1) FROM TIM SELECT f1, extract(hour from f1) FROM TIME_TBL; SELECT f1, extract(minute from f1) FROM TIME_TBL; SELECT f1, extract(second from f1) FROM TIME_TBL; +SELECT f1, extract(epoch from f1) FROM TIME_TBL; SELECT f1, sql_add(f1, 12*60*60.0 + 66) FROM TIME_TBL; SELECT f1, sql_add(f1, cast(2*60*60 as interval second)) FROM TIME_TBL; diff --git a/sql/test/pg_regress/Tests/time.stable.out b/sql/test/pg_regress/Tests/time.stable.out --- a/sql/test/pg_regress/Tests/time.stable.out +++ b/sql/test/pg_regress/Tests/time.stable.out @@ -145,9 +145,20 @@ stdout of test 'time` in directory 'sql/ [ 12:01:00.00, 0.000000 ] [ 23:59:00.00, 0.000000 ] [ NULL, NULL ] +#SELECT f1, extract(epoch from f1) FROM TIME_TBL; +% sys.time_tbl, sys.%1 # table_name +% f1, %1 # name +% time, bigint # type +% 11, 8 # length +[ 00:00:00.00, 0 ] +[ 01:00:00.00, 3600000 ] +[ 12:00:00.00, 43200000 ] +[ 12:01:00.00, 43260000 ] +[ 23:59:00.00, 86340000 ] +[ NULL, NULL ] #SELECT f1, sql_sub(f1, cast('23:22:21' as time)) FROM TIME_TBL; -% sys.time_tbl, sys.%2 # table_name -% f1, %2 # name +% sys.time_tbl, sys.%1 # table_name +% f1, %1 # name % time, sec_interval # type % 11, 10 # length [ 00:00:00.00, -84141.000 ] @@ -157,8 +168,8 @@ stdout of test 'time` in directory 'sql/ [ 23:59:00.00, 2199.000 ] [ NULL, NULL ] #SELECT f1, sql_sub(cast('23:22:21' as time), f1) FROM TIME_TBL; -% sys.time_tbl, .%2 # table_name -% f1, %2 # name +% sys.time_tbl, .%1 # table_name +% f1, %1 # name % time, sec_interval # type % 11, 9 # length [ 00:00:00.00, 84141.000 ] diff --git a/sql/test/pg_regress/Tests/timestamp.stable.err b/sql/test/pg_regress/Tests/timestamp.stable.err --- a/sql/test/pg_regress/Tests/timestamp.stable.err +++ b/sql/test/pg_regress/Tests/timestamp.stable.err @@ -403,11 +403,7 @@ MAPI = (monetdb) /var/tmp/mtest-11056/. QUERY = SELECT d1, extract(millennium from d1) FROM TIMESTAMP_TBL; ERROR = !syntax error, unexpected IDENT in: "select d1, extract(millennium" CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT d1, extract(epoch from d1) FROM TIMESTAMP_TBL; -ERROR = !syntax error, unexpected IDENT in: "select d1, extract(epoch" -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 +MAPI = (monetdb) /var/tmp/mtest-134384/.s.monetdb.30711 QUERY = SELECT d1, hour(d1) FROM TIMESTAMP_TBL; ERROR = !syntax error, unexpected HOUR in: "select d1, hour" CODE = 42000 diff --git a/sql/test/pg_regress/Tests/timestamp.stable.out b/sql/test/pg_regress/Tests/timestamp.stable.out --- a/sql/test/pg_regress/Tests/timestamp.stable.out +++ b/sql/test/pg_regress/Tests/timestamp.stable.out @@ -343,6 +343,19 @@ stdout of test 'timestamp` in directory [ 2001-09-22 18:19:20.00, 21 ] [ 1997-02-11 01:32:01.00, 20 ] [ NULL, NULL ] +#SELECT d1, extract(epoch from d1) FROM TIMESTAMP_TBL; +% sys.timestamp_tbl, sys.%1 # table_name +% d1, %1 # name +% timestamp, bigint # type +% 22, 13 # length +[ 1997-01-02 00:00:00.00, 852163200000 ] +[ 1997-01-02 03:04:05.00, 852174245000 ] +[ 1997-02-11 01:32:01.00, 855624721000 ] +[ 1997-02-11 01:32:01.00, 855624721000 ] +[ 1997-06-11 00:32:01.00, 865989121000 ] +[ 2001-09-22 18:19:20.00, 1001182760000 ] +[ 1997-02-11 01:32:01.00, 855624721000 ] +[ NULL, NULL ] #SELECT d1, week(d1) FROM TIMESTAMP_TBL; % sys.timestamp_tbl, sys.%1 # table_name % d1, %1 # name diff --git a/sql/test/pg_regress/Tests/timestamptz.stable.err b/sql/test/pg_regress/Tests/timestamptz.stable.err --- a/sql/test/pg_regress/Tests/timestamptz.stable.err +++ b/sql/test/pg_regress/Tests/timestamptz.stable.err @@ -416,11 +416,7 @@ MAPI = (monetdb) /var/tmp/mtest-11056/. QUERY = SELECT d1, extract(millennium from d1) FROM TIMESTAMPTZ_TBL; ERROR = !syntax error, unexpected IDENT in: "select d1, extract(millennium" CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 -QUERY = SELECT d1, extract(epoch from d1) FROM TIMESTAMPTZ_TBL; -ERROR = !syntax error, unexpected IDENT in: "select d1, extract(epoch" -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685 +MAPI = (monetdb) /var/tmp/mtest-134672/.s.monetdb.36496 QUERY = SELECT d1, hour(d1) FROM TIMESTAMPTZ_TBL; ERROR = !syntax error, unexpected HOUR in: "select d1, hour" CODE = 42000 diff --git a/sql/test/pg_regress/Tests/timestamptz.stable.out b/sql/test/pg_regress/Tests/timestamptz.stable.out --- a/sql/test/pg_regress/Tests/timestamptz.stable.out +++ b/sql/test/pg_regress/Tests/timestamptz.stable.out @@ -356,6 +356,19 @@ stdout of test 'timestamptz` in director [ 2001-09-22 19:19:20.00+01:00, 21 ] [ 1997-02-11 02:32:01.00+01:00, 20 ] [ NULL, NULL ] +#SELECT d1, extract(epoch from d1) FROM TIMESTAMPTZ_TBL; +% sys.timestamptz_tbl, sys.%1 # table_name +% d1, %1 # name +% timestamptz, bigint # type +% 28, 13 # length +[ 1997-01-02 01:00:00.00+01:00, 852163200000 ] +[ 1997-01-02 04:04:05.00+01:00, 852174245000 ] +[ 1997-02-11 02:32:01.00+01:00, 855624721000 ] +[ 1997-02-11 02:32:01.00+01:00, 855624721000 ] +[ 1997-06-11 01:32:01.00+01:00, 865989121000 ] +[ 2001-09-22 19:19:20.00+01:00, 1001182760000 ] +[ 1997-02-11 02:32:01.00+01:00, 855624721000 ] +[ NULL, NULL ] #SELECT d1, week(d1) FROM TIMESTAMPTZ_TBL; % sys.timestamptz_tbl, sys.%1 # table_name % d1, %1 # name diff --git a/sql/test/pg_regress/Tests/timetz.sql b/sql/test/pg_regress/Tests/timetz.sql --- a/sql/test/pg_regress/Tests/timetz.sql +++ b/sql/test/pg_regress/Tests/timetz.sql @@ -70,6 +70,7 @@ SELECT f1, extract(day from f1) FROM TIM SELECT f1, extract(hour from f1) FROM TIMETZ_TBL; SELECT f1, extract(minute from f1) FROM TIMETZ_TBL; SELECT f1, extract(second from f1) FROM TIMETZ_TBL; +SELECT f1, extract(epoch from f1) FROM TIMETZ_TBL; SELECT f1, sql_add(f1, 12*60*60.0 + 66) FROM TIMETZ_TBL; SELECT f1, sql_add(f1, cast(2*60*60 as interval second)) FROM TIMETZ_TBL; diff --git a/sql/test/pg_regress/Tests/timetz.stable.out b/sql/test/pg_regress/Tests/timetz.stable.out --- a/sql/test/pg_regress/Tests/timetz.stable.out +++ b/sql/test/pg_regress/Tests/timetz.stable.out @@ -94,6 +94,12 @@ stdout of test 'timetz` in directory 'sq % timetz, decimal # type % 17, 11 # length [ NULL, NULL ] +#SELECT f1, extract(epoch from f1) FROM TIMETZ_TBL; +% sys.timetz_tbl, sys.%1 # table_name +% f1, %1 # name +% timetz, bigint # type +% 17, 1 # length +[ NULL, NULL ] #SELECT f1, sql_sub(f1, cast('23:22:21' as timetz)) FROM TIMETZ_TBL; % sys.timetz_tbl, sys.%2 # table_name % f1, %2 # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list