Commit c546170e authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

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

 token. Seems to be isolated to datetime.c and datetime.h.
parent 6b086de3
......@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.86 2001/12/30 23:09:41 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.87 2002/01/01 02:54:27 thomas Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -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;
/***
......
......@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: datetime.h,v 1.27 2001/12/29 18:31:48 thomas Exp $
* $Id: datetime.h,v 1.28 2002/01/01 02:54:33 thomas Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment