From 56792f372965bc2995a16b63ae3c8ffb0ce6a43c Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Wed, 14 Oct 1998 15:57:25 +0000
Subject: [PATCH] Allow TIMESTAMP as a column name or general identifier. 
 timestamp had become a token a while ago, but had been omitted from the 
 keywords.c until recently. This uncovered the omission in the ColId decl.

---
 src/backend/parser/gram.c | 2 +-
 src/backend/parser/gram.y | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index ff17bfc0386..e62d58b88cb 100644
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -229,7 +229,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.45 1998/10/13 17:26:41 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.46 1998/10/14 15:57:25 thomas Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 35f55574ed2..d2e34484dac 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.36 1998/10/09 07:06:17 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.37 1998/10/14 15:56:43 thomas Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -4698,6 +4698,7 @@ ColId:  IDENT							{ $$ = $1; }
 		| STDIN							{ $$ = "stdin"; }
 		| STDOUT						{ $$ = "stdout"; }
 		| TIME							{ $$ = "time"; }
+		| TIMESTAMP						{ $$ = "timestamp"; }
 		| TIMEZONE_HOUR					{ $$ = "timezone_hour"; }
 		| TIMEZONE_MINUTE				{ $$ = "timezone_minute"; }
 		| TRIGGER						{ $$ = "trigger"; }