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.

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 3043203df689601a15f8b5e2de9d7dbfb4754c63..9bad5faacde2f786f75f7a0f2734817c527de1ca 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -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: