mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow parsing of time and timetz inputs to accept the documented input

Browse Source 
syntax '040506' for '04:05:06', as well as '0405' for '04:05:00'.  This
has been broken since 7.2 but was only recently complained of.
This commit is contained in:
Tom Lane 2003-08-25 22:47:34 +00:00
parent 3b87c1f8b6
commit 412c57b15f
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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.113 2003/08/08 21:42:05 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.114 2003/08/25 22:47:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -243,7 +243,7 @@ static datetkn datetktbl[] = {
ghst ghst
#endif #endif
{"gilt", TZ, POS(48)}, /* Gilbert Islands Time */ {"gilt", TZ, POS(48)}, /* Gilbert Islands Time */
{"gmt", TZ, POS(0)}, /* Greenwish Mean Time */ {"gmt", TZ, POS(0)}, /* Greenwich Mean Time */
{"gst", TZ, POS(40)}, /* Guam Std Time, USSR Zone 9 */ {"gst", TZ, POS(40)}, /* Guam Std Time, USSR Zone 9 */
{"gyt", TZ, NEG(16)}, /* Guyana Time */ {"gyt", TZ, NEG(16)}, /* Guyana Time */
{"h", UNITS, DTK_HOUR}, /* "hour" */ {"h", UNITS, DTK_HOUR}, /* "hour" */
@ -1989,7 +1989,8 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
* Set the type field to allow decoding other * Set the type field to allow decoding other
* fields later. Example: 20011223 or 040506 * fields later. Example: 20011223 or 040506
*/ */
if ((ftype[i] = DecodeNumberField(flen, field[i], fmask, if ((ftype[i] = DecodeNumberField(flen, field[i],
(fmask | DTK_DATE_M),
&tmask, tm, fsec, &is2digits)) < 0) &tmask, tm, fsec, &is2digits)) < 0)
return -1; return -1;
} }
@ -1998,12 +1999,14 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
} }
else if (flen > 4) else if (flen > 4)
{ {
if ((ftype[i] = DecodeNumberField(flen, field[i], fmask, if ((ftype[i] = DecodeNumberField(flen, field[i],
(fmask | DTK_DATE_M),
&tmask, tm, fsec, &is2digits)) < 0) &tmask, tm, fsec, &is2digits)) < 0)
return -1; return -1;
} }
/* otherwise it is a single date/time field... */ /* otherwise it is a single date/time field... */
else if (DecodeNumber(flen, field[i], fmask, else if (DecodeNumber(flen, field[i],
(fmask | DTK_DATE_M),
&tmask, tm, fsec, &is2digits) != 0) &tmask, tm, fsec, &is2digits) != 0)
return -1; return -1;
} }
@ -2422,8 +2425,12 @@ DecodeNumber(int flen, char *str, int fmask,
* or a run-together time: 2001.360 20011225 040506.789 * or a run-together time: 2001.360 20011225 040506.789
*/ */
if ((cp - str) > 2) if ((cp - str) > 2)
return DecodeNumberField(flen, str, (fmask | DTK_DATE_M), {
tmask, tm, fsec, is2digits); if (DecodeNumberField(flen, str, (fmask | DTK_DATE_M),
tmask, tm, fsec, is2digits) < 0)
return -1;
return 0;
}
frac = strtod(cp, &cp); frac = strtod(cp, &cp);
if (*cp != '\0') if (*cp != '\0')
@ -2507,6 +2514,13 @@ DecodeNumber(int flen, char *str, int fmask,
tm->tm_mday = val; tm->tm_mday = val;
break; break;
case (DTK_M(YEAR) | DTK_M(MONTH) | DTK_M(DAY)):
/* we have all the date, so it must be a time field */
if (DecodeNumberField(flen, str, fmask,
tmask, tm, fsec, is2digits) < 0)
return -1;
return 0;
default: default:
/* Anything else is bogus input */ /* Anything else is bogus input */
return -1; return -1;