diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-10-05 06:38:59 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 2001-10-05 06:38:59 +0000 |
| commit | 7547b0104a487e99b6c10fdcd0097e6b834d2bc8 (patch) | |
| tree | 8652cdec7e071c819469654d88dd30976e6cc23b | |
| parent | bd97e4e7be1019dd06d19d3833173b13c8838f5c (diff) | |
| download | postgresql-7547b0104a487e99b6c10fdcd0097e6b834d2bc8.tar.gz postgresql-7547b0104a487e99b6c10fdcd0097e6b834d2bc8.zip | |
Define CEST as a synonym for Central European Savings Time
per Jan Varga <varga@utcru.sk>
Fix up spacing and formatting.
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 11 | ||||
| -rw-r--r-- | src/backend/utils/adt/timestamp.c | 16 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 78f89b2c767..b5d32494f76 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.69 2001/10/04 17:10:11 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.70 2001/10/05 06:38:59 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -98,6 +98,7 @@ static datetkn datetktbl[] = { {"cat", TZ, NEG(60)}, /* Central Alaska Time */ {"cct", TZ, 48}, /* China Coast */ {"cdt", DTZ, NEG(30)}, /* Central Daylight Time */ + {"cest", DTZ, 12}, /* Central European Dayl.Time */ {"cet", TZ, 6}, /* Central European Time */ {"cetdst", DTZ, 12}, /* Central European Dayl.Time */ {"cst", TZ, NEG(36)}, /* Central Standard Time */ @@ -772,11 +773,7 @@ DecodeDateTime(char **field, int *ftype, int nf, case DTK_NOW: tmask = (DTK_DATE_M | DTK_TIME_M | DTK_M(TZ)); *dtype = DTK_DATE; -#if NOT_USED - GetCurrentTime(tm); -#else GetCurrentTimeUsec(tm, fsec); -#endif if (tzp != NULL) *tzp = CTimeZone; break; @@ -1151,11 +1148,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, case DTK_NOW: tmask = DTK_TIME_M; *dtype = DTK_TIME; -#if NOT_USED - GetCurrentTime(tm); -#else GetCurrentTimeUsec(tm, fsec); -#endif break; case DTK_ZULU: diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index fbd85df787c..6eeb349c30f 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.54 2001/10/04 14:49:57 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.55 2001/10/05 06:38:59 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -1400,8 +1400,8 @@ interval_accum(PG_FUNCTION_ARGS) memcpy(&N, DatumGetIntervalP(transdatums[1]), sizeof(Interval)); newsum = DatumGetIntervalP(DirectFunctionCall2(interval_pl, - IntervalPGetDatum(&sumX), - IntervalPGetDatum(newval))); + IntervalPGetDatum(&sumX), + IntervalPGetDatum(newval))); N.time += 1; transdatums[0] = IntervalPGetDatum(newsum); @@ -1856,7 +1856,7 @@ timestamp_trunc(PG_FUNCTION_ARGS) if (VARSIZE(units) - VARHDRSZ > MAXDATELEN) elog(ERROR, "Interval units '%s' not recognized", DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(units)))); + PointerGetDatum(units)))); up = VARDATA(units); lp = lowunits; for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++) @@ -1943,7 +1943,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS) if (VARSIZE(units) - VARHDRSZ > MAXDATELEN) elog(ERROR, "Interval units '%s' not recognized", DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(units)))); + PointerGetDatum(units)))); up = VARDATA(units); lp = lowunits; for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++) @@ -2032,7 +2032,7 @@ interval_trunc(PG_FUNCTION_ARGS) if (VARSIZE(units) - VARHDRSZ > MAXDATELEN) elog(ERROR, "Interval units '%s' not recognized", DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(units)))); + PointerGetDatum(units)))); up = VARDATA(units); lp = lowunits; for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++) @@ -2569,7 +2569,7 @@ interval_part(PG_FUNCTION_ARGS) default: elog(ERROR, "Interval units '%s' not supported", DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(units)))); + PointerGetDatum(units)))); result = 0; } @@ -2594,7 +2594,7 @@ interval_part(PG_FUNCTION_ARGS) { elog(ERROR, "Interval units '%s' not recognized", DatumGetCString(DirectFunctionCall1(textout, - PointerGetDatum(units)))); + PointerGetDatum(units)))); result = 0; } |