Allow 60 in seconds fields of timestamp, time, interval input values.

Per recent discussion on pgsql-general, this is appropriate for spec
compliance, and has the nice side-effect of easing porting from old
pg_dump files that exhibit the 59.999=>60.000 roundoff problem.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index ef82ba7c36aa18f52d27c915692e4c72127f893c..73ada66d6826a35303ea2ba7deaa467d4eb2f5be 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -2061,15 +2061,16 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
                tm->tm_hour += 12;
 
 #ifdef HAVE_INT64_TIMESTAMP
-       if (((tm->tm_hour < 0) || (tm->tm_hour > 23))
-               || ((tm->tm_min < 0) || (tm->tm_min > 59))
-               || ((tm->tm_sec < 0) || (tm->tm_sec > 60))
+       if ((tm->tm_hour < 0) || (tm->tm_hour > 23)
+               || (tm->tm_min < 0) || (tm->tm_min > 59)
+               || (tm->tm_sec < 0) || (tm->tm_sec > 60)
                || (*fsec < INT64CONST(0)) || (*fsec >= INT64CONST(1000000)))
                return -1;
 #else
-       if (((tm->tm_hour < 0) || (tm->tm_hour > 23))
-               || ((tm->tm_min < 0) || (tm->tm_min > 59))
-               || ((tm->tm_sec < 0) || ((tm->tm_sec + *fsec) >= 60)))
+       if ((tm->tm_hour < 0) || (tm->tm_hour > 23)
+               || (tm->tm_min < 0) || (tm->tm_min > 59)
+               || (tm->tm_sec < 0) || (tm->tm_sec > 60)
+               || (*fsec < 0) || (*fsec >= 1))
                return -1;
 #endif
 
@@ -2294,14 +2295,14 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
 #ifdef HAVE_INT64_TIMESTAMP
        if ((tm->tm_hour < 0)
                || (tm->tm_min < 0) || (tm->tm_min > 59)
-               || (tm->tm_sec < 0) || (tm->tm_sec > 59)
-               || (*fsec >= INT64CONST(1000000)))
+               || (tm->tm_sec < 0) || (tm->tm_sec > 60)
+               || (*fsec < INT64CONST(0)) || (*fsec >= INT64CONST(1000000)))
                return -1;
 #else
        if ((tm->tm_hour < 0)
                || (tm->tm_min < 0) || (tm->tm_min > 59)
-               || (tm->tm_sec < 0) || (tm->tm_sec > 59)
-               || (*fsec >= 1))
+               || (tm->tm_sec < 0) || (tm->tm_sec > 60)
+               || (*fsec < 0) || (*fsec >= 1))
                return -1;
 #endif
 

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 2035af076471eba3d9b3a5ee49626d794dc07c16..c4550d20432b399ed3509fab4c3fb5db8dd7cdc7 100644 (file)
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -427,9 +427,9 @@ tm2abstime(struct tm * tm, int tz)
        if (tm->tm_year < 1901 || tm->tm_year > 2038
                || tm->tm_mon < 1 || tm->tm_mon > 12
                || tm->tm_mday < 1 || tm->tm_mday > 31
-               || tm->tm_hour < 0 || tm->tm_hour >= 24
+               || tm->tm_hour < 0 || tm->tm_hour > 23
                || tm->tm_min < 0 || tm->tm_min > 59
-               || tm->tm_sec < 0 || tm->tm_sec > 59)
+               || tm->tm_sec < 0 || tm->tm_sec > 60)
                return INVALID_ABSTIME;
 
        day = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(1970, 1, 1));