Changed 1943 to 1947 to fix, other cleanups.

diff --git a/src/test/regress/expected/abstime.out b/src/test/regress/expected/abstime.out
index 5278e65..574b2c3 100644 (file)
--- a/src/test/regress/expected/abstime.out
+++ b/src/test/regress/expected/abstime.out
@@ -5,7 +5,7 @@ QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('epoch'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('current'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('infinity'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('-infinity'::abstime);
-QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1943 23:59:12');
+QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1947 23:59:12');
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00');
 WARN:Bad abstime external representation 'Feb 35, 1946 10:00:00'
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10');
@@ -22,7 +22,7 @@ eight|f1
      |current                     
      |infinity                    
      |-infinity                   
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
      |invalid                     
 (8 rows)
 
@@ -35,7 +35,7 @@ six|f1
    |epoch                       
    |current                     
    |-infinity                   
-   |Mon May 10 23:59:12 1943 PST
+   |Sat May 10 23:59:12 1947 PST
 (6 rows)
 
 QUERY: SELECT '' AS six, ABSTIME_TBL.*
@@ -47,11 +47,11 @@ six|f1
    |epoch                       
    |current                     
    |infinity                    
-   |Mon May 10 23:59:12 1943 PST
+   |Sat May 10 23:59:12 1947 PST
 (6 rows)
 
 QUERY: SELECT '' AS six, ABSTIME_TBL.*
-   WHERE 'May 10, 1943 23:59:12'::abstime <> ABSTIME_TBL.f1;
+   WHERE 'May 10, 1947 23:59:12'::abstime <> ABSTIME_TBL.f1;
 six|f1                          
 ---+----------------------------
    |Sun Jan 14 03:14:21 1973 PST
@@ -75,7 +75,7 @@ three|f1
 -----+----------------------------
      |epoch                       
      |-infinity                   
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
 (3 rows)
 
 QUERY: SELECT '' AS four, ABSTIME_TBL.*
@@ -85,12 +85,12 @@ four|f1
     |Sun Jan 14 03:14:21 1973 PST
     |epoch                       
     |-infinity                   
-    |Mon May 10 23:59:12 1943 PST
+    |Sat May 10 23:59:12 1947 PST
 (4 rows)
 
 QUERY: SELECT '' AS four, ABSTIME_TBL.*
   WHERE ABSTIME_TBL.f1 <?>
-       '["Apr 1 1945 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
+       '["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
 four|f1                          
 ----+----------------------------
     |Sun Jan 14 03:14:21 1973 PST
@@ -106,7 +106,7 @@ three|f1
 -----+----------------------------
      |Sun Jan 14 03:14:21 1973 PST
      |epoch                       
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
 (3 rows)
 
 QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -116,7 +116,7 @@ three|f1
 -----+----------------------------
      |Sun Jan 14 03:14:21 1973 PST
      |epoch                       
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
 (3 rows)
 
 QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -126,7 +126,7 @@ three|f1
 -----+----------------------------
      |Sun Jan 14 03:14:21 1973 PST
      |epoch                       
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
 (3 rows)
 
 QUERY: SELECT '' AS three, ABSTIME_TBL.*
@@ -136,7 +136,7 @@ three|f1
 -----+----------------------------
      |Sun Jan 14 03:14:21 1973 PST
      |epoch                       
-     |Mon May 10 23:59:12 1943 PST
+     |Sat May 10 23:59:12 1947 PST
 (3 rows)
 
 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
    ORDER BY abstime, reltime;
 ten|abstime                     |reltime         
 ---+----------------------------+----------------
-   |Mon May 10 23:59:12 1943 PST|@ 14 seconds ago
-   |Mon May 10 23:59:12 1943 PST|@ 1 minute      
-   |Mon May 10 23:59:12 1943 PST|@ 5 hours       
-   |Mon May 10 23:59:12 1943 PST|@ 10 days       
-   |Mon May 10 23:59:12 1943 PST|@ 3 months      
+   |Sat May 10 23:59:12 1947 PST|@ 14 seconds ago
+   |Sat May 10 23:59:12 1947 PST|@ 1 minute      
+   |Sat May 10 23:59:12 1947 PST|@ 5 hours       
+   |Sat May 10 23:59:12 1947 PST|@ 10 days       
+   |Sat May 10 23:59:12 1947 PST|@ 3 months      
    |epoch                       |@ 14 seconds ago
    |epoch                       |@ 1 minute      
    |epoch                       |@ 5 hours       

diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out
index 45ae14a..4687acc 100644 (file)
--- a/src/test/regress/expected/float8.out
+++ b/src/test/regress/expected/float8.out
@@ -209,7 +209,14 @@ WARN:can't take log of 0!
 QUERY: SELECT '' AS bad, (; (f.f1)) from FLOAT8_TBL f where f.f1 < '0.0' ;
 WARN:can't take log of a negative number
 QUERY: SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;
-WARN:exp() returned a floating point out of range
+bad|            ?column?
+---+--------------------
+   |                   1
+   |7.39912306090513e-16
+   |                   0
+   |                   0
+   |                   1
+(5 rows)
 
 QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f;
 WARN:float8div:  divide by 0.0 error

diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index d8b1344..6b708aa 100644 (file)
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -144,9 +144,9 @@ hundred|datetime                       |timespan                     |minus
        |Sat Jan 01 17:32:01.00 2000 PST|@ 34 years                   |Sat Jan 01 17:32:01.00 1966 PST
        |Sun Dec 31 17:32:01.00 2000 PST|@ 34 years                   |Sat Dec 31 17:32:01.00 1966 PST
        |Mon Jan 01 17:32:01.00 2001 PST|@ 34 years                   |Sun Jan 01 17:32:01.00 1967 PST
-       |epoch                          |@ 5 mons 12 hours            |Thu Jul 31 04:00:00.00 1969 PST
-       |epoch                          |@ 5 mons                     |Thu Jul 31 16:00:00.00 1969 PST
-       |epoch                          |@ 3 mons                     |Tue Sep 30 16:00:00.00 1969 PST
+       |epoch                          |@ 5 mons 12 hours            |Thu Jul 31 05:00:00.00 1969 PDT
+       |epoch                          |@ 5 mons                     |Thu Jul 31 17:00:00.00 1969 PDT
+       |epoch                          |@ 3 mons                     |Tue Sep 30 17:00:00.00 1969 PDT
        |epoch                          |@ 10 days                    |Sun Dec 21 16:00:00.00 1969 PST
        |epoch                          |@ 1 day 2 hours 3 mins 4 secs|Tue Dec 30 13:56:56.00 1969 PST
        |epoch                          |@ 5 hours                    |Wed Dec 31 11:00:00.00 1969 PST
@@ -430,7 +430,7 @@ QUERY: SELECT '' AS four, f1 AS abstime,
   ORDER BY abstime;
 four|abstime                     |year|month|day|hour|minute|second
 ----+----------------------------+----+-----+---+----+------+------
-    |Mon May 10 23:59:12 1943 PST|1943|    5| 10|  23|    59|    12
+    |Sat May 10 23:59:12 1947 PST|1947|    5| 10|  23|    59|    12
     |epoch                       |1969|   12| 31|  16|     0|     0
     |Sun Jan 14 03:14:21 1973 PST|1973|    1| 14|   3|    14|    21
     |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
   ORDER BY date;
 five|abstime                     |      date
 ----+----------------------------+----------
-    |Mon May 10 23:59:12 1943 PST|05-10-1943
+    |Sat May 10 23:59:12 1947 PST|05-10-1947
     |epoch                       |01-01-1970
     |Sun Jan 14 03:14:21 1973 PST|01-14-1973
     |Mon May 01 00:30:30 1995 PDT|05-01-1995

diff --git a/src/test/regress/expected/tinterval.out b/src/test/regress/expected/tinterval.out
index cf0e02a..0db800f 100644 (file)
--- a/src/test/regress/expected/tinterval.out
+++ b/src/test/regress/expected/tinterval.out
@@ -2,7 +2,7 @@ QUERY: CREATE TABLE TINTERVAL_TBL (f1  tinterval);
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
    VALUES ('["-infinity" "infinity"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
-   VALUES ('["May 10, 1943 23:59:12" "Jan 14, 1973 03:14:21"]');
+   VALUES ('["May 10, 1947 23:59:12" "Jan 14, 1973 03:14:21"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
    VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
@@ -19,7 +19,7 @@ QUERY: SELECT '' AS seven, TINTERVAL_TBL.*;
 seven|f1                                                             
 -----+---------------------------------------------------------------
      |["-infinity" "infinity"]                                       
-     |["Mon May 10 23:59:12 1943 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"]
      |["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"]                       
      |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
@@ -38,7 +38,7 @@ QUERY: SELECT '' AS three, t.*
    WHERE t.f1 #<> '@ 1 months';
 three|f1                                                             
 -----+---------------------------------------------------------------
-     |["Mon May 10 23:59:12 1943 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"]
      |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       
      |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
 (3 rows)
@@ -63,7 +63,7 @@ QUERY: SELECT '' AS three, t.*
    WHERE t.f1 #> '@ 1 year';
 three|f1                                                             
 -----+---------------------------------------------------------------
-     |["Mon May 10 23:59:12 1943 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"]
      |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       
      |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
 (3 rows)
@@ -73,7 +73,7 @@ QUERY: SELECT '' AS three, t.*
    WHERE t.f1 #>= '@ 3 years';
 three|f1                                                             
 -----+---------------------------------------------------------------
-     |["Mon May 10 23:59:12 1943 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"]
      |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       
      |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
 (3 rows)
@@ -99,7 +99,7 @@ five|f1                                                             |f1
 ----+---------------------------------------------------------------+---------------------------------------------------------------
     |["-infinity" "infinity"]                                       |["-infinity" "infinity"]                                       
     |["Thu Feb 15 12:15:03 1990 PST" "current"]                     |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
-    |["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"]
+    |["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"]
     |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       |["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"]|["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
 (5 rows)
@@ -110,17 +110,17 @@ QUERY: SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2
    ORDER BY interval1, interval2;
 fourteen|interval1                                                      |interval2                                                      
 --------+---------------------------------------------------------------+---------------------------------------------------------------
-        |["-infinity" "infinity"]                                       |["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]
+        |["-infinity" "infinity"]                                       |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]
         |["-infinity" "infinity"]                                       |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
         |["-infinity" "infinity"]                                       |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       
         |["-infinity" "infinity"]                                       |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
-        |["Mon May 10 23:59:12 1943 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]                                       
-        |["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"]
+        |["Sat May 10 23:59:12 1947 PST" "Sun Jan 14 03:14:21 1973 PST"]|["-infinity" "infinity"]                                       
+        |["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"]
         |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       |["-infinity" "infinity"]                                       
         |["Thu Feb 15 12:15:03 1990 PST" "current"]                     |["-infinity" "infinity"]                                       
         |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
         |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]|["-infinity" "infinity"]                                       
-        |["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"]                       
+        |["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"]                       
         |["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"]                       
         |["Thu Feb 15 12:15:03 1990 PST" "current"]                     |["epoch" "Mon May 01 00:30:30 1995 PDT"]                       
         |["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
 ----+---------------------------------------------------------------
     |["Thu Feb 15 12:15:03 1990 PST" "current"]                     
     |["Sun Sep 04 23:59:12 1983 PDT" "Tue Oct 04 23:59:12 1983 PDT"]
-    |["Mon May 10 23:59:12 1943 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"]
 (3 rows)
 
 QUERY: SELECT '' AS three, t1.f1

diff --git a/src/test/regress/sql/abstime.sql b/src/test/regress/sql/abstime.sql
index 24e5370..8e9e7b9 100644 (file)
--- a/src/test/regress/sql/abstime.sql
+++ b/src/test/regress/sql/abstime.sql
@@ -21,7 +21,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('infinity'::abstime);
 
 INSERT INTO ABSTIME_TBL (f1) VALUES ('-infinity'::abstime);
 
-INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1943 23:59:12');
+INSERT INTO ABSTIME_TBL (f1) VALUES ('May 10, 1947 23:59:12');
 
 
 -- what happens if we specify slightly misformatted abstime? 
@@ -46,7 +46,7 @@ SELECT '' AS six, ABSTIME_TBL.*
    WHERE ABSTIME_TBL.f1 > '-infinity'::abstime;
 
 SELECT '' AS six, ABSTIME_TBL.*
-   WHERE 'May 10, 1943 23:59:12'::abstime <> ABSTIME_TBL.f1;
+   WHERE 'May 10, 1947 23:59:12'::abstime <> ABSTIME_TBL.f1;
 
 SELECT '' AS one, ABSTIME_TBL.*
    WHERE 'current'::abstime = ABSTIME_TBL.f1;
@@ -59,7 +59,7 @@ SELECT '' AS four, ABSTIME_TBL.*
 
 SELECT '' AS four, ABSTIME_TBL.*
   WHERE ABSTIME_TBL.f1 <?>
-       '["Apr 1 1945 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
+       '["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'::tinterval;
 
 -- these four queries should return the same answer
 -- the "infinity" and "-infinity" tuples in ABSTIME_TBL cannot be added and

diff --git a/src/test/regress/sql/tinterval.sql b/src/test/regress/sql/tinterval.sql
index 432e0bf..00b4cf1 100644 (file)
--- a/src/test/regress/sql/tinterval.sql
+++ b/src/test/regress/sql/tinterval.sql
@@ -4,7 +4,7 @@ INSERT INTO TINTERVAL_TBL (f1)
    VALUES ('["-infinity" "infinity"]');
 
 INSERT INTO TINTERVAL_TBL (f1)
-   VALUES ('["May 10, 1943 23:59:12" "Jan 14, 1973 03:14:21"]');
+   VALUES ('["May 10, 1947 23:59:12" "Jan 14, 1973 03:14:21"]');
 
 INSERT INTO TINTERVAL_TBL (f1)
    VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');