Define CEST as a synonym for Central European Savings Time
per Jan Varga <varga@utcru.sk> Fix up spacing and formatting.
This commit is contained in:
parent
bd97e4e7be
commit
7547b0104a
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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 */
|
{"cat", TZ, NEG(60)}, /* Central Alaska Time */
|
||||||
{"cct", TZ, 48}, /* China Coast */
|
{"cct", TZ, 48}, /* China Coast */
|
||||||
{"cdt", DTZ, NEG(30)}, /* Central Daylight Time */
|
{"cdt", DTZ, NEG(30)}, /* Central Daylight Time */
|
||||||
|
{"cest", DTZ, 12}, /* Central European Dayl.Time */
|
||||||
{"cet", TZ, 6}, /* Central European Time */
|
{"cet", TZ, 6}, /* Central European Time */
|
||||||
{"cetdst", DTZ, 12}, /* Central European Dayl.Time */
|
{"cetdst", DTZ, 12}, /* Central European Dayl.Time */
|
||||||
{"cst", TZ, NEG(36)}, /* Central Standard Time */
|
{"cst", TZ, NEG(36)}, /* Central Standard Time */
|
||||||
@ -772,11 +773,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
|
|||||||
case DTK_NOW:
|
case DTK_NOW:
|
||||||
tmask = (DTK_DATE_M | DTK_TIME_M | DTK_M(TZ));
|
tmask = (DTK_DATE_M | DTK_TIME_M | DTK_M(TZ));
|
||||||
*dtype = DTK_DATE;
|
*dtype = DTK_DATE;
|
||||||
#if NOT_USED
|
|
||||||
GetCurrentTime(tm);
|
|
||||||
#else
|
|
||||||
GetCurrentTimeUsec(tm, fsec);
|
GetCurrentTimeUsec(tm, fsec);
|
||||||
#endif
|
|
||||||
if (tzp != NULL)
|
if (tzp != NULL)
|
||||||
*tzp = CTimeZone;
|
*tzp = CTimeZone;
|
||||||
break;
|
break;
|
||||||
@ -1151,11 +1148,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
|
|||||||
case DTK_NOW:
|
case DTK_NOW:
|
||||||
tmask = DTK_TIME_M;
|
tmask = DTK_TIME_M;
|
||||||
*dtype = DTK_TIME;
|
*dtype = DTK_TIME;
|
||||||
#if NOT_USED
|
|
||||||
GetCurrentTime(tm);
|
|
||||||
#else
|
|
||||||
GetCurrentTimeUsec(tm, fsec);
|
GetCurrentTimeUsec(tm, fsec);
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DTK_ZULU:
|
case DTK_ZULU:
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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));
|
memcpy(&N, DatumGetIntervalP(transdatums[1]), sizeof(Interval));
|
||||||
|
|
||||||
newsum = DatumGetIntervalP(DirectFunctionCall2(interval_pl,
|
newsum = DatumGetIntervalP(DirectFunctionCall2(interval_pl,
|
||||||
IntervalPGetDatum(&sumX),
|
IntervalPGetDatum(&sumX),
|
||||||
IntervalPGetDatum(newval)));
|
IntervalPGetDatum(newval)));
|
||||||
N.time += 1;
|
N.time += 1;
|
||||||
|
|
||||||
transdatums[0] = IntervalPGetDatum(newsum);
|
transdatums[0] = IntervalPGetDatum(newsum);
|
||||||
@ -1856,7 +1856,7 @@ timestamp_trunc(PG_FUNCTION_ARGS)
|
|||||||
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
||||||
elog(ERROR, "Interval units '%s' not recognized",
|
elog(ERROR, "Interval units '%s' not recognized",
|
||||||
DatumGetCString(DirectFunctionCall1(textout,
|
DatumGetCString(DirectFunctionCall1(textout,
|
||||||
PointerGetDatum(units))));
|
PointerGetDatum(units))));
|
||||||
up = VARDATA(units);
|
up = VARDATA(units);
|
||||||
lp = lowunits;
|
lp = lowunits;
|
||||||
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
||||||
@ -1943,7 +1943,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
|
|||||||
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
||||||
elog(ERROR, "Interval units '%s' not recognized",
|
elog(ERROR, "Interval units '%s' not recognized",
|
||||||
DatumGetCString(DirectFunctionCall1(textout,
|
DatumGetCString(DirectFunctionCall1(textout,
|
||||||
PointerGetDatum(units))));
|
PointerGetDatum(units))));
|
||||||
up = VARDATA(units);
|
up = VARDATA(units);
|
||||||
lp = lowunits;
|
lp = lowunits;
|
||||||
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
||||||
@ -2032,7 +2032,7 @@ interval_trunc(PG_FUNCTION_ARGS)
|
|||||||
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
if (VARSIZE(units) - VARHDRSZ > MAXDATELEN)
|
||||||
elog(ERROR, "Interval units '%s' not recognized",
|
elog(ERROR, "Interval units '%s' not recognized",
|
||||||
DatumGetCString(DirectFunctionCall1(textout,
|
DatumGetCString(DirectFunctionCall1(textout,
|
||||||
PointerGetDatum(units))));
|
PointerGetDatum(units))));
|
||||||
up = VARDATA(units);
|
up = VARDATA(units);
|
||||||
lp = lowunits;
|
lp = lowunits;
|
||||||
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
for (i = 0; i < (VARSIZE(units) - VARHDRSZ); i++)
|
||||||
@ -2569,7 +2569,7 @@ interval_part(PG_FUNCTION_ARGS)
|
|||||||
default:
|
default:
|
||||||
elog(ERROR, "Interval units '%s' not supported",
|
elog(ERROR, "Interval units '%s' not supported",
|
||||||
DatumGetCString(DirectFunctionCall1(textout,
|
DatumGetCString(DirectFunctionCall1(textout,
|
||||||
PointerGetDatum(units))));
|
PointerGetDatum(units))));
|
||||||
result = 0;
|
result = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2594,7 +2594,7 @@ interval_part(PG_FUNCTION_ARGS)
|
|||||||
{
|
{
|
||||||
elog(ERROR, "Interval units '%s' not recognized",
|
elog(ERROR, "Interval units '%s' not recognized",
|
||||||
DatumGetCString(DirectFunctionCall1(textout,
|
DatumGetCString(DirectFunctionCall1(textout,
|
||||||
PointerGetDatum(units))));
|
PointerGetDatum(units))));
|
||||||
result = 0;
|
result = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user