diff options
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 6712d6d8d44..a1cf2b4ed54 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.191 2008/09/10 18:29:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.192 2008/09/11 15:27:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2256,9 +2256,25 @@ DecodeTime(char *str, int fmask, int range, tm->tm_hour = 0; } } - else if (*cp != ':') - return DTERR_BAD_FORMAT; - else + else if (*cp == '.') + { + /* always assume mm:ss.sss is MINUTE TO SECOND */ + double frac; + + str = cp; + frac = strtod(str, &cp); + if (*cp != '\0') + return DTERR_BAD_FORMAT; +#ifdef HAVE_INT64_TIMESTAMP + *fsec = rint(frac * 1000000); +#else + *fsec = frac; +#endif + tm->tm_sec = tm->tm_min; + tm->tm_min = tm->tm_hour; + tm->tm_hour = 0; + } + else if (*cp == ':') { str = cp + 1; errno = 0; @@ -2284,6 +2300,8 @@ DecodeTime(char *str, int fmask, int range, else return DTERR_BAD_FORMAT; } + else + return DTERR_BAD_FORMAT; /* do a sanity check */ #ifdef HAVE_INT64_TIMESTAMP |