mirror of
https://github.com/postgres/postgres.git
synced 2025-05-18 17:41:14 +03:00
transformColumnDefinition failed to complain about
create table foo (bar int default null default 3); due to not thinking about the special-case handling of DEFAULT NULL. Problem noticed while investigating bug #3396.
This commit is contained in:
parent
4ed20db4f4
commit
d9544b67ce
@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.290.2.4 2006/10/11 20:03:26 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.290.2.5 2007/06/20 18:21:39 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -962,6 +962,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
|
||||
{
|
||||
bool is_serial;
|
||||
bool saw_nullable;
|
||||
bool saw_default;
|
||||
Constraint *constraint;
|
||||
List *clist;
|
||||
|
||||
@ -1066,6 +1067,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
|
||||
transformConstraintAttrs(column->constraints);
|
||||
|
||||
saw_nullable = false;
|
||||
saw_default = false;
|
||||
|
||||
foreach(clist, column->constraints)
|
||||
{
|
||||
@ -1110,13 +1112,15 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
|
||||
break;
|
||||
|
||||
case CONSTR_DEFAULT:
|
||||
if (column->raw_default != NULL)
|
||||
if (saw_default)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_SYNTAX_ERROR),
|
||||
errmsg("multiple default values specified for column \"%s\" of table \"%s\"",
|
||||
column->colname, cxt->relation->relname)));
|
||||
/* Note: DEFAULT NULL maps to constraint->raw_expr == NULL */
|
||||
column->raw_default = constraint->raw_expr;
|
||||
Assert(constraint->cooked_expr == NULL);
|
||||
saw_default = true;
|
||||
break;
|
||||
|
||||
case CONSTR_PRIMARY:
|
||||
|
Loading…
x
Reference in New Issue
Block a user