Fix SERIAL columns, which Thomas inadvertently broke parsing of.

tglsfdc · tglsfdc · commit 37a71f90b266 · 2000-02-20T02:14:58.000Z
Revised code probably accepts some silly combinations, but that's better
than not accepting valid ones.
diff --git 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;
 				}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.146 2000/02/19 19:37:21 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.147 2000/02/20 02:14:58 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1047,7 +1047,7 @@ columnDef: ColId Typename ColQualifier opt_collate`
`1047`	`1047`
`1048`	`1048`	`$$ = (Node *)n;`
`1049`	`1049`	`}`
`1050`		`- \| ColId SERIAL PrimaryKey`
	`1050`	`+ \| ColId SERIAL ColQualifier opt_collate`
`1051`	`1051`	`{`
`1052`	`1052`	`ColumnDef *n = makeNode(ColumnDef);`
`1053`	`1053`	`n->colname = $1;`
`@@ -1060,7 +1060,11 @@ columnDef: ColId Typename ColQualifier opt_collate`
`1060`	`1060`	`#endif`
`1061`	`1061`	`n->is_not_null = TRUE;`
`1062`	`1062`	`n->is_sequence = TRUE;`
`1063`		`- n->constraints = lcons($3, NIL);`
	`1063`	`+ n->constraints = $3;`
	`1064`	`+`
	`1065`	`+ if ($4 != NULL)`
	`1066`	`+ elog(NOTICE,"CREATE TABLE/COLLATE %s not yet implemented"`
	`1067`	`+ "; clause ignored", $4);`
`1064`	`1068`
`1065`	`1069`	`$$ = (Node *)n;`
`1066`	`1070`	`}`