aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/datetime.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-05-27 21:31:23 +0000
committerBruce Momjian <bruce@momjian.us>2005-05-27 21:31:23 +0000
commitd4b50caf25eeb6473fc3e19d35560f75700f7006 (patch)
treebf8894eb5b4cfc10f4d718c11b93d1bab5fa8950 /src/backend/utils/adt/datetime.c
parent5dafb69e1723d6963288be31df2804738d1fc732 (diff)
downloadpostgresql-d4b50caf25eeb6473fc3e19d35560f75700f7006.tar.gz
postgresql-d4b50caf25eeb6473fc3e19d35560f75700f7006.zip
Display only 9 subsecond digits instead of 10 for time values, for
consistency and to prevent rounding for days < 30. Also round off all trailing zeros, rather than leaving an even number of digits.
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
-rw-r--r--src/backend/utils/adt/datetime.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 53026363a13..260c8abb341 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.149 2005/05/27 15:16:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.150 2005/05/27 21:31:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3461,12 +3461,9 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int *tzp, int style, char *str)
#ifdef HAVE_INT64_TIMESTAMP
sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
#else
- sprintf(str + strlen(str), ":%013.10f", tm->tm_sec + fsec);
+ sprintf(str + strlen(str), ":%012.9f", tm->tm_sec + fsec);
#endif
- /* chop off trailing pairs of zeros... */
- while (strcmp((str + strlen(str) - 2), "00") == 0 &&
- *(str + strlen(str) - 3) != '.')
- *(str + strlen(str) - 2) = '\0';
+ TrimTrailingZeros(str);
}
else
sprintf(str + strlen(str), ":%02d", tm->tm_sec);
@@ -3804,7 +3801,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str)
sprintf(cp, ".%06d", Abs(fsec));
#else
fsec += tm->tm_sec;
- sprintf(cp, ":%013.10f", fabs(fsec));
+ sprintf(cp, ":%012.9f", fabs(fsec));
#endif
TrimTrailingZeros(cp);
cp += strlen(cp);