Rename TIME token to ISOTIME to eliminate conflict with gram.y parser

 token. Seems to be isolated to datetime.c and datetime.h.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index d9852937d97f51833d1625780350f52af2e942b1..3bba28797daf80f817d390d0a111064d02c3a0b4 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -414,7 +414,7 @@ sgt
 #if 0
 syot
 #endif
-       {"t", TIME, DTK_TIME},          /* Filler for ISO time fields */
+       {"t", ISOTIME, DTK_TIME},               /* Filler for ISO time fields */
 #if 0
 taht
 #endif
@@ -1353,7 +1353,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
                                                ptype = val;
                                                break;
 
-                                       case TIME:
+                                       case ISOTIME:
                                                /* This is a filler field "t"
                                                 * indicating that the next field is time.
                                                 * Try to verify that this is sensible.
@@ -1909,7 +1909,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
                                                ptype = val;
                                                break;
 
-                                       case TIME:
+                                       case ISOTIME:
                                                tmask = 0;
 
                                                /***

diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index c2f5551e153cb0217cb5bab814883646d62622c2..4bf13c3b8665370c198497f88442beb42071b15f 100644 (file)
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -109,8 +109,8 @@
 #define ABS_BEFORE             18
 #define ABS_AFTER              19
 /* generic fields to help with parsing */
-#define DATE   20
-#define TIME   21
+#define ISODATE        20
+#define ISOTIME        21
 /* reserved for unrecognized string values */
 #define UNKNOWN_FIELD  31