Fix improper display of fractional seconds in interval values

tglsfdc · tglsfdc · commit 607b39855a56 · 2008-10-02T13:47:38.000Z
when using --enable-integer-datetimes and a non-ISO datestyle.

Ron Mayer
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.194 2008/09/24 19:46:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.195 2008/10/02 13:47:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3791,7 +3791,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)
 					is_before = TRUE;
 				}
 				sprintf(cp, "%s%d.%02d secs", is_nonzero ? " " : "",
-						tm->tm_sec, ((int) sec) / 10000);
+						tm->tm_sec, abs((int) rint(sec / 10000.0)));
 				cp += strlen(cp);
 #else
 				fsec += tm->tm_sec;

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.194 2008/09/24 19:46:44 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.195 2008/10/02 13:47:38 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3791,7 +3791,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)`
`3791`	`3791`	`is_before = TRUE;`
`3792`	`3792`	`}`
`3793`	`3793`	`sprintf(cp, "%s%d.%02d secs", is_nonzero ? " " : "",`
`3794`		`- tm->tm_sec, ((int) sec) / 10000);`
	`3794`	`+ tm->tm_sec, abs((int) rint(sec / 10000.0)));`
`3795`	`3795`	`cp += strlen(cp);`
`3796`	`3796`	`#else`
`3797`	`3797`	`fsec += tm->tm_sec;`