Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4d9b4dc

Browse files
bmomjianbmomjian
committed
Changed 1943 to 1947 to fix, other cleanups.
1 parent c3a960a commit 4d9b4dc

File tree

6 files changed

+45
-38
lines changed

6 files changed

+45
-38
lines changed

‎src/test/regress/expected/abstime.out

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('epoch'::abstime);
55
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('current'::abstime);
66
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('infinity'::abstime);
77
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('-infinity'::abstime);
8-
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1943 23:59:12');
8+
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1947 23:59:12');
99
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00');
1010
WARN:Bad abstime external representation 'Feb 35, 1946 10:00:00'
1111
QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10');
@@ -22,7 +22,7 @@ eight|f1
2222
|current
2323
|infinity
2424
|-infinity
25-
|Mon May 10 23:59:12 1943 PST
25+
|Sat May 10 23:59:12 1947 PST
2626
|invalid
2727
(8 rows)
2828

@@ -35,7 +35,7 @@ six|f1
3535
|epoch
3636
|current
3737
|-infinity
38-
|Mon May 10 23:59:12 1943 PST
38+
|Sat May 10 23:59:12 1947 PST
3939
(6 rows)
4040

4141
QUERY: SELECT '' AS six, ABSTIME_TBL.*
@@ -47,11 +47,11 @@ six|f1
4747
|epoch
4848
|current
4949
|infinity
50-
|Mon May 10 23:59:12 1943 PST
50+
|Sat May 10 23:59:12 1947 PST
5151
(6 rows)
5252

5353
QUERY: SELECT '' AS six, ABSTIME_TBL.*
54-
WHERE 'May 10, 1943 23:59:12'::abstime <> ABSTIME_TBL.f1;
54+
WHERE 'May 10, 1947 23:59:12'::abstime <> ABSTIME_TBL.f1;
5555
six|f1
5656
---+----------------------------
5757
|Sun Jan 14 03:14:21 1973 PST
@@ -75,7 +75,7 @@ three|f1
7575
-----+----------------------------
7676
|epoch
7777
|-infinity
78-
|Mon May 10 23:59:12 1943 PST
78+
|Sat May 10 23:59:12 1947 PST
7979
(3 rows)
8080

8181
QUERY: SELECT '' AS four, ABSTIME_TBL.*
@@ -85,12 +85,12 @@ four|f1
8585
|Sun Jan 14 03:14:21 1973 PST
8686
|epoch
8787
|-infinity
88-
|Mon May 10 23:59:12 1943 PST
88+
|Sat May 10 23:59:12 1947 PST
8989
(4 rows)
9090

9191
QUERY: SELECT '' AS four, ABSTIME_TBL.*
9292
WHERE ABSTIME_TBL.f1 <?>
93-
'["Apr 1 1945 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
93+
'["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
9494
four|f1
9595
----+----------------------------
9696
|Sun Jan 14 03:14:21 1973 PST
@@ -106,7 +106,7 @@ three|f1
106106
-----+----------------------------
107107
|Sun Jan 14 03:14:21 1973 PST
108108
|epoch
109-
|Mon May 10 23:59:12 1943 PST
109+
|Sat May 10 23:59:12 1947 PST
110110
(3 rows)
111111

112112
QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -116,7 +116,7 @@ three|f1
116116
-----+----------------------------
117117
|Sun Jan 14 03:14:21 1973 PST
118118
|epoch
119-
|Mon May 10 23:59:12 1943 PST
119+
|Sat May 10 23:59:12 1947 PST
120120
(3 rows)
121121

122122
QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -126,7 +126,7 @@ three|f1
126126
-----+----------------------------
127127
|Sun Jan 14 03:14:21 1973 PST
128128
|epoch
129-
|Mon May 10 23:59:12 1943 PST
129+
|Sat May 10 23:59:12 1947 PST
130130
(3 rows)
131131

132132
QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -136,7 +136,7 @@ three|f1
136136
-----+----------------------------
137137
|Sun Jan 14 03:14:21 1973 PST
138138
|epoch
139-
|Mon May 10 23:59:12 1943 PST
139+
|Sat May 10 23:59:12 1947 PST
140140
(3 rows)
141141

142142
QUERY: SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime
@@ -145,11 +145,11 @@ QUERY: SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime
145145
ORDER BY abstime, reltime;
146146
ten|abstime |reltime
147147
---+----------------------------+----------------
148-
|Mon May 10 23:59:12 1943 PST|@ 14 seconds ago
149-
|Mon May 10 23:59:12 1943 PST|@ 1 minute
150-
|Mon May 10 23:59:12 1943 PST|@ 5 hours
151-
|Mon May 10 23:59:12 1943 PST|@ 10 days
152-
|Mon May 10 23:59:12 1943 PST|@ 3 months
148+
|Sat May 10 23:59:12 1947 PST|@ 14 seconds ago
149+
|Sat May 10 23:59:12 1947 PST|@ 1 minute
150+
|Sat May 10 23:59:12 1947 PST|@ 5 hours
151+
|Sat May 10 23:59:12 1947 PST|@ 10 days
152+
|Sat May 10 23:59:12 1947 PST|@ 3 months
153153
|epoch |@ 14 seconds ago
154154
|epoch |@ 1 minute
155155
|epoch |@ 5 hours

‎src/test/regress/expected/float8.out

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,14 @@ WARN:can't take log of 0!
209209
QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ;
210210
WARN:can't take log of a negative number
211211
QUERY: SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;
212-
WARN:exp() returned a floating point out of range
212+
bad| ?column?
213+
---+--------------------
214+
| 1
215+
|7.39912306090513e-16
216+
| 0
217+
| 0
218+
| 1
219+
(5 rows)
213220

214221
QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
215222
WARN:float8div: divide by 0.0 error

‎src/test/regress/expected/horology.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ hundred|datetime |timespan |minus
144144
|Sat Jan 01 17:32:01.00 2000 PST|@ 34 years |Sat Jan 01 17:32:01.00 1966 PST
145145
|Sun Dec 31 17:32:01.00 2000 PST|@ 34 years |Sat Dec 31 17:32:01.00 1966 PST
146146
|Mon Jan 01 17:32:01.00 2001 PST|@ 34 years |Sun Jan 01 17:32:01.00 1967 PST
147-
|epoch |@ 5 mons 12 hours |Thu Jul 31 04:00:00.00 1969 PST
148-
|epoch |@ 5 mons |Thu Jul 31 16:00:00.00 1969 PST
149-
|epoch |@ 3 mons |Tue Sep 30 16:00:00.00 1969 PST
147+
|epoch |@ 5 mons 12 hours |Thu Jul 31 05:00:00.00 1969 PDT
148+
|epoch |@ 5 mons |Thu Jul 31 17:00:00.00 1969 PDT
149+
|epoch |@ 3 mons |Tue Sep 30 17:00:00.00 1969 PDT
150150
|epoch |@ 10 days |Sun Dec 21 16:00:00.00 1969 PST
151151
|epoch |@ 1 day 2 hours 3 mins 4 secs|Tue Dec 30 13:56:56.00 1969 PST
152152
|epoch |@ 5 hours |Wed Dec 31 11:00:00.00 1969 PST
@@ -430,7 +430,7 @@ QUERY: SELECT '' AS four, f1 AS abstime,
430430
ORDER BY abstime;
431431
four|abstime |year|month|day|hour|minute|second
432432
----+----------------------------+----+-----+---+----+------+------
433-
|Mon May 10 23:59:12 1943 PST|1943| 5| 10| 23| 59| 12
433+
|Sat May 10 23:59:12 1947 PST|1947| 5| 10| 23| 59| 12
434434
|epoch |1969| 12| 31| 16| 0| 0
435435
|Sun Jan 14 03:14:21 1973 PST|1973| 1| 14| 3| 14| 21
436436
|Mon May 01 00:30:30 1995 PDT|1995| 5| 1| 0| 30| 30
@@ -477,7 +477,7 @@ QUERY: SELECT '' AS five, f1 AS abstime, date( f1) AS date
477477
ORDER BY date;
478478
five|abstime | date
479479
----+----------------------------+----------
480-
|Mon May 10 23:59:12 1943 PST|05-10-1943
480+
|Sat May 10 23:59:12 1947 PST|05-10-1947
481481
|epoch |01-01-1970
482482
|Sun Jan 14 03:14:21 1973 PST|01-14-1973
483483
|Mon May 01 00:30:30 1995 PDT|05-01-1995

‎src/test/regress/expected/tinterval.out

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ QUERY: CREATE TABLE TINTERVAL_TBL (f1 tinterval);
22
QUERY: INSERT INTO TINTERVAL_TBL (f1)
33
VALUES ('["-infinity" "infinity"]');
44
QUERY: INSERT INTO TINTERVAL_TBL (f1)
5-
VALUES ('["May 10, 1943 23:59:12" "Jan 14, 1973 03:14:21"]');
5+
VALUES ('["May 10, 1947 23:59:12" "Jan 14, 1973 03:14:21"]');
66
QUERY: INSERT INTO TINTERVAL_TBL (f1)
77
VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');
88
QUERY: INSERT INTO TINTERVAL_TBL (f1)
@@ -19,7 +19,7 @@ QUERY: SELECT '' AS seven, TINTERVAL_TBL.*;
1919
seven|f1
2020
-----+---------------------------------------------------------------
2121
|["-infinity" "infinity"]
22-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
22+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
2323
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
2424
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
2525
|["Thu Feb 15 12:15:03 1990 PST" "current"]
@@ -38,7 +38,7 @@ QUERY: SELECT '' AS three, t.*
3838
WHERE t.f1 #<> '@ 1 months';
3939
three|f1
4040
-----+---------------------------------------------------------------
41-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
41+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
4242
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
4343
|["Thu Feb 15 12:15:03 1990 PST" "current"]
4444
(3 rows)
@@ -63,7 +63,7 @@ QUERY: SELECT '' AS three, t.*
6363
WHERE t.f1 #> '@ 1 year';
6464
three|f1
6565
-----+---------------------------------------------------------------
66-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
66+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
6767
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
6868
|["Thu Feb 15 12:15:03 1990 PST" "current"]
6969
(3 rows)
@@ -73,7 +73,7 @@ QUERY: SELECT '' AS three, t.*
7373
WHERE t.f1 #>= '@ 3 years';
7474
three|f1
7575
-----+---------------------------------------------------------------
76-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
76+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
7777
|["epoch" "Mon May 01 00:30:30 1995 PDT"]
7878
|["Thu Feb 15 12:15:03 1990 PST" "current"]
7979
(3 rows)
@@ -99,7 +99,7 @@ five|f1 |f1
9999
----+---------------------------------------------------------------+---------------------------------------------------------------
100100
|["-infinity" "infinity"] |["-infinity" "infinity"]
101101
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
102-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
102+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
103103
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
104104
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
105105
(5 rows)
@@ -110,17 +110,17 @@ QUERY: SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2
110110
ORDER BY interval1, interval2;
111111
fourteen|interval1 |interval2
112112
--------+---------------------------------------------------------------+---------------------------------------------------------------
113-
|["-infinity" "infinity"] |["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
113+
|["-infinity" "infinity"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
114114
|["-infinity" "infinity"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
115115
|["-infinity" "infinity"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
116116
|["-infinity" "infinity"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
117-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]
118-
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
117+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]
118+
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
119119
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["-infinity" "infinity"]
120120
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["-infinity" "infinity"]
121121
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Thu Feb 15 12:15:03 1990 PST" "current"]
122122
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["-infinity" "infinity"]
123-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
123+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
124124
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["epoch" "Mon May 01 00:30:30 1995 PDT"]
125125
|["Thu Feb 15 12:15:03 1990 PST" "current"] |["epoch" "Mon May 01 00:30:30 1995 PDT"]
126126
|["epoch" "Mon May 01 00:30:30 1995 PDT"] |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
@@ -135,7 +135,7 @@ five|f1
135135
----+---------------------------------------------------------------
136136
|["Thu Feb 15 12:15:03 1990 PST" "current"]
137137
|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
138-
|["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
138+
|["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
139139
(3 rows)
140140

141141
QUERY: SELECT '' AS three, t1.f1

‎src/test/regress/sql/abstime.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('infinity'::abstime);
2121

2222
INSERT INTO ABSTIME_TBL (f1) VALUES ('-infinity'::abstime);
2323

24-
INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1943 23:59:12');
24+
INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1947 23:59:12');
2525

2626

2727
-- what happens if we specify slightly misformatted abstime?
@@ -46,7 +46,7 @@ SELECT '' AS six, ABSTIME_TBL.*
4646
WHERE ABSTIME_TBL.f1 > '-infinity'::abstime;
4747

4848
SELECT '' AS six, ABSTIME_TBL.*
49-
WHERE 'May 10, 1943 23:59:12'::abstime <> ABSTIME_TBL.f1;
49+
WHERE 'May 10, 1947 23:59:12'::abstime <> ABSTIME_TBL.f1;
5050

5151
SELECT '' AS one, ABSTIME_TBL.*
5252
WHERE 'current'::abstime = ABSTIME_TBL.f1;
@@ -59,7 +59,7 @@ SELECT '' AS four, ABSTIME_TBL.*
5959

6060
SELECT '' AS four, ABSTIME_TBL.*
6161
WHERE ABSTIME_TBL.f1 <?>
62-
'["Apr 1 1945 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
62+
'["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
6363

6464
-- these four queries should return the same answer
6565
-- the "infinity" and "-infinity" tuples in ABSTIME_TBL cannot be added and

‎src/test/regress/sql/tinterval.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ INSERT INTO TINTERVAL_TBL (f1)
44
VALUES ('["-infinity" "infinity"]');
55

66
INSERT INTO TINTERVAL_TBL (f1)
7-
VALUES ('["May 10, 1943 23:59:12" "Jan 14, 1973 03:14:21"]');
7+
VALUES ('["May 10, 1947 23:59:12" "Jan 14, 1973 03:14:21"]');
88

99
INSERT INTO TINTERVAL_TBL (f1)
1010
VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');

0 commit comments

Comments
 (0)