interval_out failed to mention 'ago' for negative intervals in SQL and

GERMAN datestyles.  Ancient bug reported by Terry Lee Tucker.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index e98475f..47dc28d 100644 (file)
--- 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 e1d34e8..7a06069 100644 (file)
--- 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);