Changeset: 751b14c3a25f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=751b14c3a25f
Modified Files:
sql/test/pg_regress/Tests/time.stable.err
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.stable.err
sql/test/pg_regress/Tests/timetz.stable.out
Branch: default
Log Message:
Approve new outputs of time, timetz, timestamp and timestamptz after fix for
3679
diffs (truncated from 3234 to 300 lines):
diff --git a/sql/test/pg_regress/Tests/time.stable.err
b/sql/test/pg_regress/Tests/time.stable.err
--- a/sql/test/pg_regress/Tests/time.stable.err
+++ b/sql/test/pg_regress/Tests/time.stable.err
@@ -29,67 +29,79 @@ stderr of test 'time` in directory 'sql/
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
+QUERY = INSERT INTO TIME_TBL VALUES ('02:03 PST');
+ERROR = !daytime (02:03 PST) has incorrect format
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
+QUERY = INSERT INTO TIME_TBL VALUES ('11:59 EDT');
+ERROR = !daytime (11:59 EDT) has incorrect format
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
+QUERY = INSERT INTO TIME_TBL VALUES ('11:59:59.99 AM');
+ERROR = !daytime (11:59:59.99 AM) has incorrect format
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
+QUERY = INSERT INTO TIME_TBL VALUES ('11:59:59.99 PM');
+ERROR = !daytime (11:59:59.99 PM) has incorrect format
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
ERROR = !SELECT: no such binary operator 'sql_add(time,time)'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, day(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected DAY in: "select f1, day"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, "day"(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and sec_interval(19,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, hour(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected HOUR in: "select f1, hour"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, minute(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected MINUTE in: "select f1, minute"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, second(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected SECOND in: "select f1, second"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, extract(day from f1) FROM TIME_TBL;
ERROR = !types time(3,0) and sec_interval(19,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, sql_add(f1, cast('2:44:59' as time)) FROM TIME_TBL;
ERROR = !SELECT: no such binary operator 'sql_add(time,time)'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, sql_add(f1, cast('2:44:59 CET' as timetz)) FROM TIME_TBL;
ERROR = !SELECT: no such binary operator 'sql_add(time,timetz)'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, month(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected MONTH in: "select f1, month"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, "month"(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and month_interval(32,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, year(f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected YEAR in: "select f1, year"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, "year"(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and month_interval(32,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, extract(week from f1) FROM TIME_TBL;
ERROR = !syntax error, unexpected IDENT in: "select f1, extract(week"
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, extract(month from f1) FROM TIME_TBL;
ERROR = !types time(3,0) and month_interval(32,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, extract(year from f1) FROM TIME_TBL;
ERROR = !types time(3,0) and month_interval(32,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, week(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and date(0,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, weekofyear(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and date(0,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, dayofmonth(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and date(0,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, dayofweek(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and date(0,0) are not equal for column 'f1'
-MAPI = (monetdb) /var/tmp/mtest-18336/.s.monetdb.30933
+MAPI = (monetdb) /var/tmp/mtest-4716/.s.monetdb.32178
QUERY = SELECT f1, dayofyear(f1) FROM TIME_TBL;
ERROR = !types time(3,0) and date(0,0) are not equal for column 'f1'
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
@@ -32,21 +32,12 @@ Ready.
[ 1 ]
#INSERT INTO TIME_TBL VALUES ('01:00');
[ 1 ]
-#-- as of 7.4, timezone spec should be accepted and ignored
-#INSERT INTO TIME_TBL VALUES ('02:03 PST');
-[ 1 ]
-#INSERT INTO TIME_TBL VALUES ('11:59 EDT');
-[ 1 ]
#INSERT INTO TIME_TBL VALUES ('12:00');
[ 1 ]
#INSERT INTO TIME_TBL VALUES ('12:01');
[ 1 ]
#INSERT INTO TIME_TBL VALUES ('23:59');
[ 1 ]
-#INSERT INTO TIME_TBL VALUES ('11:59:59.99 AM');
-[ 1 ]
-#INSERT INTO TIME_TBL VALUES ('11:59:59.99 PM');
-[ 1 ]
#SELECT f1 AS "Time" FROM TIME_TBL;
% sys.L # table_name
% Time # name
@@ -54,13 +45,9 @@ Ready.
% 11 # length
[ 00:00:00.00 ]
[ 01:00:00.00 ]
-[ 02:03:00.00 ]
-[ 11:59:00.00 ]
[ 12:00:00.00 ]
[ 12:01:00.00 ]
[ 23:59:00.00 ]
-[ 11:59:59.99 ]
-[ 11:59:59.99 ]
#SELECT f1 AS "Three" FROM TIME_TBL WHERE f1 < '05:06:07';
% sys.L # table_name
% Three # name
@@ -68,18 +55,14 @@ Ready.
% 11 # length
[ 00:00:00.00 ]
[ 01:00:00.00 ]
-[ 02:03:00.00 ]
#SELECT f1 AS "Six" FROM TIME_TBL WHERE f1 > '05:06:07';
% sys.L # table_name
% Six # name
% time # type
% 11 # length
-[ 11:59:00.00 ]
[ 12:00:00.00 ]
[ 12:01:00.00 ]
[ 23:59:00.00 ]
-[ 11:59:59.99 ]
-[ 11:59:59.99 ]
#SELECT f1 AS "None" FROM TIME_TBL WHERE f1 < '00:00';
% sys.L # table_name
% None # name
@@ -92,13 +75,9 @@ Ready.
% 11 # length
[ 00:00:00.00 ]
[ 01:00:00.00 ]
-[ 02:03:00.00 ]
-[ 11:59:00.00 ]
[ 12:00:00.00 ]
[ 12:01:00.00 ]
[ 23:59:00.00 ]
-[ 11:59:59.99 ]
-[ 11:59:59.99 ]
#INSERT INTO TIME_TBL VALUES (null);
[ 1 ]
#SELECT f1, "hour"(f1) FROM TIME_TBL;
@@ -108,13 +87,9 @@ Ready.
% 11, 2 # length
[ 00:00:00.00, 0 ]
[ 01:00:00.00, 1 ]
-[ 02:03:00.00, 2 ]
-[ 11:59:00.00, 11 ]
[ 12:00:00.00, 12 ]
[ 12:01:00.00, 12 ]
[ 23:59:00.00, 23 ]
-[ 11:59:59.99, 11 ]
-[ 11:59:59.99, 11 ]
[ NULL, NULL ]
#SELECT f1, "minute"(f1) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -123,13 +98,9 @@ Ready.
% 11, 2 # length
[ 00:00:00.00, 0 ]
[ 01:00:00.00, 0 ]
-[ 02:03:00.00, 3 ]
-[ 11:59:00.00, 59 ]
[ 12:00:00.00, 0 ]
[ 12:01:00.00, 1 ]
[ 23:59:00.00, 59 ]
-[ 11:59:59.99, 59 ]
-[ 11:59:59.99, 59 ]
[ NULL, NULL ]
#SELECT f1, "second"(f1) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -138,13 +109,9 @@ Ready.
% 11, 11 # length
[ 00:00:00.00, 0.000 ]
[ 01:00:00.00, 0.000 ]
-[ 02:03:00.00, 0.000 ]
-[ 11:59:00.00, 0.000 ]
[ 12:00:00.00, 0.000 ]
[ 12:01:00.00, 0.000 ]
[ 23:59:00.00, 0.000 ]
-[ 11:59:59.99, 59.990 ]
-[ 11:59:59.99, 59.990 ]
[ NULL, NULL ]
#SELECT f1, extract(hour from f1) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -153,13 +120,9 @@ Ready.
% 11, 2 # length
[ 00:00:00.00, 0 ]
[ 01:00:00.00, 1 ]
-[ 02:03:00.00, 2 ]
-[ 11:59:00.00, 11 ]
[ 12:00:00.00, 12 ]
[ 12:01:00.00, 12 ]
[ 23:59:00.00, 23 ]
-[ 11:59:59.99, 11 ]
-[ 11:59:59.99, 11 ]
[ NULL, NULL ]
#SELECT f1, extract(minute from f1) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -168,13 +131,9 @@ Ready.
% 11, 2 # length
[ 00:00:00.00, 0 ]
[ 01:00:00.00, 0 ]
-[ 02:03:00.00, 3 ]
-[ 11:59:00.00, 59 ]
[ 12:00:00.00, 0 ]
[ 12:01:00.00, 1 ]
[ 23:59:00.00, 59 ]
-[ 11:59:59.99, 59 ]
-[ 11:59:59.99, 59 ]
[ NULL, NULL ]
#SELECT f1, extract(second from f1) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -183,13 +142,9 @@ Ready.
% 11, 11 # length
[ 00:00:00.00, 0.000 ]
[ 01:00:00.00, 0.000 ]
-[ 02:03:00.00, 0.000 ]
-[ 11:59:00.00, 0.000 ]
[ 12:00:00.00, 0.000 ]
[ 12:01:00.00, 0.000 ]
[ 23:59:00.00, 0.000 ]
-[ 11:59:59.99, 59.990 ]
-[ 11:59:59.99, 59.990 ]
[ NULL, NULL ]
#SELECT f1, sql_add(f1, 12*60*60.0 + 66) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -198,13 +153,9 @@ Ready.
% 11, 15 # length
[ 00:00:00.00, 12:01:06.000000 ]
[ 01:00:00.00, 13:01:06.000000 ]
-[ 02:03:00.00, 14:04:06.000000 ]
-[ 11:59:00.00, 00:00:06.000000 ]
[ 12:00:00.00, 00:01:06.000000 ]
[ 12:01:00.00, 00:02:06.000000 ]
[ 23:59:00.00, 12:00:06.000000 ]
-[ 11:59:59.99, 00:01:05.990000 ]
-[ 11:59:59.99, 00:01:05.990000 ]
[ NULL, NULL ]
#SELECT f1, sql_add(f1, cast(2*60*60 as interval second)) FROM TIME_TBL;
% sys.time_tbl, sys.L1 # table_name
@@ -213,13 +164,9 @@ Ready.
% 11, 15 # length
[ 00:00:00.00, 02:00:00.000000 ]
[ 01:00:00.00, 03:00:00.000000 ]
-[ 02:03:00.00, 04:03:00.000000 ]
-[ 11:59:00.00, 13:59:00.000000 ]
[ 12:00:00.00, 14:00:00.000000 ]
[ 12:01:00.00, 14:01:00.000000 ]
[ 23:59:00.00, 01:59:00.000000 ]
-[ 11:59:59.99, 13:59:59.990000 ]
-[ 11:59:59.99, 13:59:59.990000 ]
[ NULL, NULL ]
#SELECT f1, sql_sub(f1, 12*60*60.0 + 66) FROM TIME_TBL;
% sys.time_tbl, sys.L # table_name
@@ -228,13 +175,9 @@ Ready.
% 11, 15 # length
[ 00:00:00.00, 11:58:54.000000 ]
[ 01:00:00.00, 12:58:54.000000 ]
-[ 02:03:00.00, 14:01:54.000000 ]
-[ 11:59:00.00, 23:57:54.000000 ]
[ 12:00:00.00, 23:58:54.000000 ]
[ 12:01:00.00, 23:59:54.000000 ]
[ 23:59:00.00, 11:57:54.000000 ]
-[ 11:59:59.99, 23:58:53.990000 ]
-[ 11:59:59.99, 23:58:53.990000 ]
[ NULL, NULL ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
