database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-11 00:12:06 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane
2003-05-04 04:30:35 +00:00
parent f1b3af29c1
commit c04e80cf87
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/datetime.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.96.2.4 2003/02/20 05:25:24 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.96.2.5 2003/05/04 04:30:35 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -2061,15 +2061,16 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
tm->tm_hour += 12; tm->tm_hour += 12;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (((tm->tm_hour < 0) || (tm->tm_hour > 23)) if ((tm->tm_hour < 0) || (tm->tm_hour > 23)
|| ((tm->tm_min < 0) || (tm->tm_min > 59)) || (tm->tm_min < 0) || (tm->tm_min > 59)
|| ((tm->tm_sec < 0) || (tm->tm_sec > 60)) || (tm->tm_sec < 0) || (tm->tm_sec > 60)
|| (*fsec < INT64CONST(0)) || (*fsec >= INT64CONST(1000000))) || (*fsec < INT64CONST(0)) || (*fsec >= INT64CONST(1000000)))
return -1; return -1;
#else #else
if (((tm->tm_hour < 0) || (tm->tm_hour > 23)) if ((tm->tm_hour < 0) || (tm->tm_hour > 23)
|| ((tm->tm_min < 0) || (tm->tm_min > 59)) || (tm->tm_min < 0) || (tm->tm_min > 59)
|| ((tm->tm_sec < 0) || ((tm->tm_sec + *fsec) >= 60))) || (tm->tm_sec < 0) || (tm->tm_sec > 60)
|| (*fsec < 0) || (*fsec >= 1))
return -1; return -1;
#endif #endif
@@ -2294,14 +2295,14 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if ((tm->tm_hour < 0) if ((tm->tm_hour < 0)
|| (tm->tm_min < 0) || (tm->tm_min > 59) || (tm->tm_min < 0) || (tm->tm_min > 59)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59) || (tm->tm_sec < 0) || (tm->tm_sec > 60)
|| (*fsec >= INT64CONST(1000000))) || (*fsec < INT64CONST(0)) || (*fsec >= INT64CONST(1000000)))
return -1; return -1;
#else #else
if ((tm->tm_hour < 0) if ((tm->tm_hour < 0)
|| (tm->tm_min < 0) || (tm->tm_min > 59) || (tm->tm_min < 0) || (tm->tm_min > 59)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59) || (tm->tm_sec < 0) || (tm->tm_sec > 60)
|| (*fsec >= 1)) || (*fsec < 0) || (*fsec >= 1))
return -1; return -1;
#endif #endif

6
src/backend/utils/adt/nabstime.c
View File

@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.100.2.3 2003/02/20 05:25:24 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.100.2.4 2003/05/04 04:30:35 tgl Exp $
* *
* NOTES * NOTES
* *
@@ -427,9 +427,9 @@ tm2abstime(struct tm * tm, int tz)
if (tm->tm_year < 1901 || tm->tm_year > 2038 if (tm->tm_year < 1901 || tm->tm_year > 2038
|| tm->tm_mon < 1 || tm->tm_mon > 12 || tm->tm_mon < 1 || tm->tm_mon > 12
|| tm->tm_mday < 1 || tm->tm_mday > 31 || 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_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; return INVALID_ABSTIME;
day = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(1970, 1, 1)); day = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j(1970, 1, 1));