Define CEST as a synonym for Central European Savings Time

 per Jan Varga 
Fix up spacing and formatting.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 78f89b2c767671b0005f815f6e93dd66a7ef7cd0..b5d32494f76b89cc1ac499e9e96785de30a93bc1 100644 (file)
--- 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 fbd85df787c9382fb5f8597bfe0df6257b78092d..6eeb349c30f37ec8b4f7efe7b22496b2d3870eca 100644 (file)
--- 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;
    }