Check a bit more carefully for preceeding ISO field tags

 when decoding date fields.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 4175e047652194e84e70007fe6b4fdd127ade6e5..7d7c645f2ed98a0e2e9e7ca1169ac8efd6ea0d20 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -959,18 +959,18 @@ DecodeDateTime(char **field, int *ftype, int nf,
                                        if (tzp == NULL)
                                                return -1;
 
-                                       if (ptype != 0)
-                                       {
-                                               /* Sanity check; should not fail this test */
-                                               if (ptype != DTK_TIME)
-                                                       return -1;
-                                               ptype = 0;
-                                       }
-
-                                       if (isdigit(*field[i]))
+                                       if ((isdigit(*field[i]) || (ptype != 0))
                                        {
                                                char *cp;
 
+                                               if (ptype != 0)
+                                               {
+                                                       /* Sanity check; should not fail this test */
+                                                       if (ptype != DTK_TIME)
+                                                               return -1;
+                                                       ptype = 0;
+                                               }
+
                                                /* Starts with a digit but we already have a time field?
                                                 * Then we are in trouble with a date and time already...
                                                 */