From d3d00715e21c6ced9fc833d791250a251bc455e1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 11 Jan 2005 18:33:46 +0000 Subject: [PATCH] interval_out failed to mention 'ago' for negative intervals in SQL and GERMAN datestyles. Ancient bug reported by Terry Lee Tucker. --- src/backend/utils/adt/datetime.c | 4 ++-- src/interfaces/ecpg/pgtypeslib/interval.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index e98475fb920..47dc28d1326 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.136 2004/12/31 22:01:21 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.137 2005/01/11 18:33:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3932,7 +3932,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str) cp += strlen(cp); } - if (is_before && (style == USE_POSTGRES_DATES)) + if (is_before && (style != USE_ISO_DATES)) { strcat(cp, " ago"); cp += strlen(cp); diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index e1d34e8a7b2..7a06069634c 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -663,7 +663,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str) cp += strlen(cp); } - if (is_before && (style == USE_POSTGRES_DATES)) + if (is_before && (style != USE_ISO_DATES)) { strcat(cp, " ago"); cp += strlen(cp);