Fix bugs with parsing signed hh:mm and hh:mm:ss fields in interval input.

DecodeInterval() failed to honor the "range" parameter (the special SQL
syntax for indicating which fields appear in the literal string) if the
time was signed.  This seems inappropriate, so make it work like the
not-signed case.  The inconsistency was introduced in my commit
f867339c0148381eb1d01f93ab5c79f9d10211de, which as noted in its log message
was only really focused on making SQL-compliant literals work per spec.
Including a sign here is not per spec, but if we're going to allow it
then it's reasonable to expect it to work like the not-signed case.

Also, remove bogus setting of tmask, which caused subsequent processing to
think that what had been given was a timezone and not an hh:mm(:ss) field,
thus confusing checks for redundant fields.  This seems to be an aboriginal
mistake in Lockhart's commit 2cf1642461536d0d8f3a1cf124ead0eac04eb760.

Add regression test cases to illustrate the changed behaviors.

Back-patch as far as 8.4, where support for spec-compliant interval
literals was added.

Range problem reported and diagnosed by Amit Kapila, tmask problem by me.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index b82aad0f7e04373a2247cdcb01f41007bbb3004d..a74dce79f504cf18a255057f688476a2e87f5007 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -2874,19 +2874,18 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                        case DTK_TZ:
 
                                /*
-                                * Timezone is a token with a leading sign character and at
+                                * Timezone means a token with a leading sign character and at
                                 * least one digit; there could be ':', '.', '-' embedded in
                                 * it as well.
                                 */
                                Assert(*field[i] == '-' || *field[i] == '+');
 
                                /*
-                                * Try for hh:mm or hh:mm:ss.  If not, fall through to
-                                * DTK_NUMBER case, which can handle signed float numbers and
-                                * signed year-month values.
+                                * Check for signed hh:mm or hh:mm:ss.  If so, process exactly
+                                * like DTK_TIME case above, plus handling the sign.
                                 */
                                if (strchr(field[i] + 1, ':') != NULL &&
-                                       DecodeTime(field[i] + 1, fmask, INTERVAL_FULL_RANGE,
+                                       DecodeTime(field[i] + 1, fmask, range,
                                                           &tmask, tm, fsec) == 0)
                                {
                                        if (*field[i] == '-')
@@ -2904,9 +2903,14 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
                                         * are reading right to left.
                                         */
                                        type = DTK_DAY;
-                                       tmask = DTK_M(TZ);
                                        break;
                                }
+
+                               /*
+                                * Otherwise, fall through to DTK_NUMBER case, which can
+                                * handle signed float numbers and signed year-month values.
+                                */
+
                                /* FALL THROUGH */
 
                        case DTK_DATE:

diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
index a6f50b46221ffeac7ea170b1ab0a01ef5b36473d..040c64ce05ef4dca0cba6323e4b9b7a63e61029b 100644 (file)
--- a/src/test/regress/expected/interval.out
+++ b/src/test/regress/expected/interval.out
@@ -545,6 +545,30 @@ SELECT interval '1 2:03:04' minute to second;
  1 day 02:03:04
 (1 row)
 
+SELECT interval '1 +2:03' minute to second;
+    interval    
+----------------
+ 1 day 00:02:03
+(1 row)
+
+SELECT interval '1 +2:03:04' minute to second;
+    interval    
+----------------
+ 1 day 02:03:04
+(1 row)
+
+SELECT interval '1 -2:03' minute to second;
+    interval     
+-----------------
+ 1 day -00:02:03
+(1 row)
+
+SELECT interval '1 -2:03:04' minute to second;
+    interval     
+-----------------
+ 1 day -02:03:04
+(1 row)
+
 SELECT interval '123 11' day to hour; -- ok
      interval      
 -------------------
@@ -559,6 +583,10 @@ SELECT interval '123 11'; -- not ok, too ambiguous
 ERROR:  invalid input syntax for type interval: "123 11"
 LINE 1: SELECT interval '123 11';
                         ^
+SELECT interval '123 2:03 -2:04'; -- not ok, redundant hh:mm fields
+ERROR:  invalid input syntax for type interval: "123 2:03 -2:04"
+LINE 1: SELECT interval '123 2:03 -2:04';
+                        ^
 -- test syntaxes for restricted precision
 SELECT interval(0) '1 day 01:23:45.6789';
     interval    

diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
index f342a18af2d876ae9f5a0d7c8a9e2b8c73f1cb0d..29594ea1f5ddf836f37aebf179224743fbca3137 100644 (file)
--- a/src/test/regress/sql/interval.sql
+++ b/src/test/regress/sql/interval.sql
@@ -165,9 +165,14 @@ SELECT interval '1 2:03:04' hour to second;
 SELECT interval '1 2' minute to second;
 SELECT interval '1 2:03' minute to second;
 SELECT interval '1 2:03:04' minute to second;
+SELECT interval '1 +2:03' minute to second;
+SELECT interval '1 +2:03:04' minute to second;
+SELECT interval '1 -2:03' minute to second;
+SELECT interval '1 -2:03:04' minute to second;
 SELECT interval '123 11' day to hour; -- ok
 SELECT interval '123 11' day; -- not ok
 SELECT interval '123 11'; -- not ok, too ambiguous
+SELECT interval '123 2:03 -2:04'; -- not ok, redundant hh:mm fields
 
 -- test syntaxes for restricted precision
 SELECT interval(0) '1 day 01:23:45.6789';