mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
Fix a bug in input processing for the "interval" type. Previously,
"microsecond" and "millisecond" units were not considered valid input by themselves, which caused inputs like "1 millisecond" to be rejected erroneously. Update the docs, add regression tests, and backport to 8.2 and 8.1
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.179 2007/05/27 20:32:16 neilc Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.180 2007/05/29 04:58:43 neilc Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -924,6 +924,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
|
||||
#else
|
||||
*fsec = frac;
|
||||
#endif
|
||||
tmask = DTK_ALL_SECS_M;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1699,6 +1700,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
|
||||
#else
|
||||
*fsec = frac;
|
||||
#endif
|
||||
tmask = DTK_ALL_SECS_M;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -2805,6 +2807,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
|
||||
#else
|
||||
*fsec += (val + fval) * 1e-6;
|
||||
#endif
|
||||
tmask = DTK_M(MICROSECOND);
|
||||
break;
|
||||
|
||||
case DTK_MILLISEC:
|
||||
@ -2813,6 +2816,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
|
||||
#else
|
||||
*fsec += (val + fval) * 1e-3;
|
||||
#endif
|
||||
tmask = DTK_M(MILLISECOND);
|
||||
break;
|
||||
|
||||
case DTK_SECOND:
|
||||
@ -2822,7 +2826,15 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
|
||||
#else
|
||||
*fsec += fval;
|
||||
#endif
|
||||
tmask = DTK_M(SECOND);
|
||||
/*
|
||||
* If any subseconds were specified, consider
|
||||
* this microsecond and millisecond input as
|
||||
* well.
|
||||
*/
|
||||
if (fval == 0)
|
||||
tmask = DTK_M(SECOND);
|
||||
else
|
||||
tmask = DTK_ALL_SECS_M;
|
||||
break;
|
||||
|
||||
case DTK_MINUTE:
|
||||
|
Reference in New Issue
Block a user