Fix mis-display of negative fractional seconds in interval values for

--enable-integer-datetimes case.  Per report from Oliver Siegmar.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 452641494fa0d673509861ae282e6dfab13882f7..95dfd7519d2f54a538036f902b897fab61d38190 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.96.2.7 2005/01/11 18:34:29 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.96.2.8 2005/04/20 17:15:19 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3593,17 +3593,25 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
                        /* fractional seconds? */
                        if (fsec != 0)
                        {
+                               fsec_t          sec;
+
 #ifdef HAVE_INT64_TIMESTAMP
+                               sec = fsec;
                                if (is_before || ((!is_nonzero) && (tm->tm_sec < 0)))
+                               {
                                        tm->tm_sec = -tm->tm_sec;
+                                       sec = -sec;
+                                       is_before = TRUE;
+                               }
+                               else if ((!is_nonzero) && (tm->tm_sec == 0) && (fsec < 0))
+                               {
+                                       sec = -sec;
+                                       is_before = TRUE;
+                               }
                                sprintf(cp, "%s%d.%02d secs", (is_nonzero ? " " : ""),
-                                               tm->tm_sec, (((int) fsec) / 10000));
+                                               tm->tm_sec, (((int) sec) / 10000));
                                cp += strlen(cp);
-                               if (!is_nonzero)
-                                       is_before = (fsec < 0);
 #else
-                               fsec_t          sec;
-
                                fsec += tm->tm_sec;
                                sec = fsec;
                                if (is_before || ((!is_nonzero) && (fsec < 0)))
@@ -3615,9 +3623,8 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
                                        is_before = (fsec < 0);
 #endif
                                is_nonzero = TRUE;
-
-                               /* otherwise, integer seconds only? */
                        }
+                       /* otherwise, integer seconds only? */
                        else if (tm->tm_sec != 0)
                        {
                                int                     sec = tm->tm_sec;