diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 2000-04-14 15:22:10 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 2000-04-14 15:22:10 +0000 |
| commit | d221e149b477451cec4756a0490af7a9bb66f345 (patch) | |
| tree | cc79cfb4fb9429a3a40d4b37cdb6e29eb67a2de4 /src/backend/utils/adt/datetime.c | |
| parent | 99cc10accc82184b38ac2990be5aa79d58ec3951 (diff) | |
| download | postgresql-d221e149b477451cec4756a0490af7a9bb66f345.tar.gz postgresql-d221e149b477451cec4756a0490af7a9bb66f345.zip | |
Fix (well, add) support for ISO "week" in date_part(). Needed for ODBC.
Fix spelling of "millennium".
Thanks to Mika Nystrom <mika@camembert.cs.caltech.edu> for spotting this.
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 2f899d21e93..f252a42ddc5 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.46 2000/04/12 17:15:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.47 2000/04/14 15:22:10 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -260,15 +260,14 @@ static datetkn deltatktbl[] = { {"hours", UNITS, DTK_HOUR}, /* "hours" relative time units */ {"hr", UNITS, DTK_HOUR}, /* "hour" relative time units */ {"hrs", UNITS, DTK_HOUR}, /* "hours" relative time units */ - {INVALID, RESERV, DTK_INVALID}, /* "invalid" reserved for invalid - * time */ + {INVALID, RESERV, DTK_INVALID}, /* reserved for invalid time */ {"m", UNITS, DTK_MINUTE}, /* "minute" relative time units */ {"microsecon", UNITS, DTK_MICROSEC}, /* "microsecond" relative * time units */ - {"mil", UNITS, DTK_MILLENIUM}, /* "millenium" relative time units */ - {"mils", UNITS, DTK_MILLENIUM}, /* "millenia" relative time units */ - {"millenia", UNITS, DTK_MILLENIUM}, /* "millenia" relative time units */ - {DMILLENIUM, UNITS, DTK_MILLENIUM}, /* "millenium" relative time units */ + {"mil", UNITS, DTK_MILLENNIUM}, /* "millennium" relative time units */ + {"mils", UNITS, DTK_MILLENNIUM}, /* "millennia" relative time units */ + {"millennia", UNITS, DTK_MILLENNIUM}, /* "millennia" relative time units */ + {DMILLENNIUM, UNITS, DTK_MILLENNIUM}, /* "millennium" relative time units */ {"millisecon", UNITS, DTK_MILLISEC}, /* relative time units */ {"min", UNITS, DTK_MINUTE}, /* "minute" relative time units */ {"mins", UNITS, DTK_MINUTE},/* "minutes" relative time units */ @@ -1794,7 +1793,7 @@ DecodeDateDelta(char **field, int *ftype, int nf, int *dtype, struct tm * tm, do tmask = ((fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR)); break; - case DTK_MILLENIUM: + case DTK_MILLENNIUM: tm->tm_year += val * 1000; if (fval != 0) tm->tm_mon += (fval * 12000); |