From a93bf4503ffc6d7cd6243a6324fb2ef206b10adf Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 14 Oct 2005 11:47:57 +0000 Subject: Allow times of 24:00:00 to match rounding behavior: regression=# select '23:59:59.9'::time(0); time ---------- 24:00:00 (1 row) This is bad because: regression=# select '24:00:00'::time(0); ERROR: date/time field value out of range: "24:00:00" The last example now works. --- src/backend/utils/adt/datetime.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/backend/utils/adt/datetime.c') diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 74dda5441f1..faacdb2eba4 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.158 2005/10/09 17:21:46 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.159 2005/10/14 11:47:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1114,7 +1114,9 @@ DecodeDateTime(char **field, int *ftype, int nf, * Check upper limit on hours; other limits checked in * DecodeTime() */ - if (tm->tm_hour > 23) + /* test for > 24:00:00 */ + if (tm->tm_hour > 24 || + (tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0))) return DTERR_FIELD_OVERFLOW; break; @@ -2243,14 +2245,16 @@ DecodeTimeOnly(char **field, int *ftype, int nf, else if (mer == PM && tm->tm_hour != 12) tm->tm_hour += 12; + if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 || + tm->tm_sec < 0 || tm->tm_sec > 60 || tm->tm_hour > 24 || + /* test for > 24:00:00 */ + (tm->tm_hour == 24 && (tm->tm_min > 0 || tm->tm_sec > 0 || #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 || + *fsec > INT64CONST(0))) || *fsec < INT64CONST(0) || *fsec >= USECS_PER_SEC) return DTERR_FIELD_OVERFLOW; #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 > 60 || + *fsec > 0)) || *fsec < 0 || *fsec >= 1) return DTERR_FIELD_OVERFLOW; #endif -- cgit v1.2.3