From 37a71f90b266b7d7d12a55e326aebb1c3cb9621f Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 20 Feb 2000 02:14:58 +0000
Subject: [PATCH] Fix SERIAL columns, which Thomas inadvertently broke parsing
 of. Revised code probably accepts some silly combinations, but that's better
 than not accepting valid ones.

---
 src/backend/parser/gram.y | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index a2c2d93547..f43393eeff 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.146 2000/02/19 19:37:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.147 2000/02/20 02:14:58 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1047,7 +1047,7 @@ columnDef:  ColId Typename ColQualifier opt_collate
 
 					$$ = (Node *)n;
 				}
-			| ColId SERIAL PrimaryKey
+			| ColId SERIAL ColQualifier opt_collate
 				{
 					ColumnDef *n = makeNode(ColumnDef);
 					n->colname = $1;
@@ -1060,7 +1060,11 @@ columnDef:  ColId Typename ColQualifier opt_collate
 #endif
 					n->is_not_null = TRUE;
 					n->is_sequence = TRUE;
-					n->constraints = lcons($3, NIL);
+					n->constraints = $3;
+
+					if ($4 != NULL)
+						elog(NOTICE,"CREATE TABLE/COLLATE %s not yet implemented"
+							 "; clause ignored", $4);
 
 					$$ = (Node *)n;
 				}
-- 
2.40.0