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

tglsfdc · tglsfdc · commit d3d00715e21c · 2005-01-11T18:33:46.000Z
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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.136 2004/12/31 22:01:21 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.137 2005/01/11 18:33:45 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3932,7 +3932,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)`
`3932`	`3932`	`cp += strlen(cp);`
`3933`	`3933`	`}`
`3934`	`3934`
`3935`		`- if (is_before && (style == USE_POSTGRES_DATES))`
	`3935`	`+ if (is_before && (style != USE_ISO_DATES))`
`3936`	`3936`	`{`
`3937`	`3937`	`strcat(cp, " ago");`
`3938`	`3938`	`cp += strlen(cp);`
Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)`
`663`	`663`	`cp += strlen(cp);`
`664`	`664`	`}`
`665`	`665`
`666`		`- if (is_before && (style == USE_POSTGRES_DATES))`
	`666`	`+ if (is_before && (style != USE_ISO_DATES))`
`667`	`667`	`{`
`668`	`668`	`strcat(cp, " ago");`
`669`	`669`	`cp += strlen(cp);`