Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 37a71f9

Browse files
committed
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.
1 parent 751a14e commit 37a71f9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/backend/parser/gram.y

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* 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 $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -1047,7 +1047,7 @@ columnDef: ColId Typename ColQualifier opt_collate
10471047

10481048
$$ = (Node *)n;
10491049
}
1050-
| ColId SERIAL PrimaryKey
1050+
| ColId SERIAL ColQualifier opt_collate
10511051
{
10521052
ColumnDef *n = makeNode(ColumnDef);
10531053
n->colname = $1;
@@ -1060,7 +1060,11 @@ columnDef: ColId Typename ColQualifier opt_collate
10601060
#endif
10611061
n->is_not_null = TRUE;
10621062
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);
10641068

10651069
$$ = (Node *)n;
10661070
}

0 commit comments

Comments
 (0)