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.

src/backend/utils/adt/datetime.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.103 2003/04/04 04:50:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.104 2003/05/04 04:30:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2080,15 +2080,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
 
@@ -2313,14 +2314,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
 

src/backend/utils/adt/nabstime.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.106 2003/04/04 04:50:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.107 2003/05/04 04:30:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -320,9 +320,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) - UNIX_EPOCH_JDATE;