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 aa369cc59b2259fb27c94d75df15743c311e5585..fb01c7d30f16a3e03c72f0a2e66a7b92d313063b 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.118.2.3 2004/06/13 17:17:48 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.118.2.4 2005/01/11 18:33:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3907,7 +3907,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);

diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index e1d34e8a7b20d3591e05706066017351cba680e3..7a06069634c5e9f61afc149ad2a85c82fe3d03a6 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);