Fix integral timestamps so the output is consistent in all cases to

round:

	select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7
		seconds';

Ron Mayer

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 3a47b32909e9760306d39e574d216cd9f37fde54..61fc5559952e33379f82c8b9c0c23da743d0937d 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -2888,7 +2888,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                {
                                        case DTK_MICROSEC:
 #ifdef HAVE_INT64_TIMESTAMP
-                                               *fsec += val + fval;
+                                               *fsec += rint(val + fval);
 #else
                                                *fsec += (val + fval) * 1e-6;
 #endif
@@ -2897,7 +2897,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
 
                                        case DTK_MILLISEC:
 #ifdef HAVE_INT64_TIMESTAMP
-                                               *fsec += (val + fval) * 1000;
+                                               *fsec += rint((val + fval) * 1000);
 #else
                                                *fsec += (val + fval) * 1e-3;
 #endif
@@ -2907,7 +2907,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                        case DTK_SECOND:
                                                tm->tm_sec += val;
 #ifdef HAVE_INT64_TIMESTAMP
-                                               *fsec += fval * 1000000;
+                                               *fsec += rint(fval * 1000000);
 #else
                                                *fsec += fval;
 #endif
@@ -2932,7 +2932,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                                        sec = fval;
                                                        tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
-                                                       *fsec += (fval - sec) * 1000000;
+                                                       *fsec += rint((fval - sec) * 1000000);
 #else
                                                        *fsec += fval - sec;
 #endif
@@ -2950,7 +2950,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                                        sec = fval;
                                                        tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
-                                                       *fsec += (fval - sec) * 1000000;
+                                                       *fsec += rint((fval - sec) * 1000000);
 #else
                                                        *fsec += fval - sec;
 #endif
@@ -2969,7 +2969,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                                        sec = fval;
                                                        tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
-                                                       *fsec += (fval - sec) * 1000000;
+                                                       *fsec += rint((fval - sec) * 1000000);
 #else
                                                        *fsec += fval - sec;
 #endif
@@ -2995,7 +2995,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                                                sec = fval;
                                                                tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
-                                                               *fsec += (fval - sec) * 1000000;
+                                                               *fsec += rint((fval - sec) * 1000000);
 #else
                                                                *fsec += fval - sec;
 #endif
@@ -3022,7 +3022,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                                                sec = fval;
                                                                tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
-                                                               *fsec += (fval - sec) * 1000000;
+                                                               *fsec += rint((fval - sec) * 1000000);
 #else
                                                                *fsec += fval - sec;
 #endif