diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-02-20 02:14:58 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-02-20 02:14:58 +0000 |
| commit | 37a71f90b266b7d7d12a55e326aebb1c3cb9621f (patch) | |
| tree | 7107278e608b5f15b429d0d969b2484ad50c256a /src | |
| parent | 751a14e60c309068557e68c8f322007e0522947a (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index a2c2d93547b..f43393eeff8 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; } |