Allow text timezone designations, e.g. "America/Chicago", when using the

ISO "T" timestamptz format.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 26c6742e8b10d8476589873cbcb38f25633079c9..c29b8e1019168d5c610b63da6f88526977e49217 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -944,6 +944,16 @@ DecodeDateTime(char **field, int *ftype, int nf,
                                break;
 
                        case DTK_TIME:
+                               /*
+                                * This might be an ISO time following a "t" field.
+                                */
+                               if (ptype != 0)
+                               {
+                                       /* Sanity check; should not fail this test */
+                                       if (ptype != DTK_TIME)
+                                               return DTERR_BAD_FORMAT;
+                                       ptype = 0;
+                               }
                                dterr = DecodeTime(field[i], fmask, INTERVAL_FULL_RANGE,
                                                                   &tmask, tm, fsec);
                                if (dterr)