postgres.git / summary / log / commit / refs

commit    01e570e68491335fa3902afdb59ca7df7e72bdcc
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Jun 20 18:21:51 2007 +0000
First released in: 8.3.0, 7.3.20, 7.4.18, 8.0.14, 8.1.10, 8.2.5

    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.


 src/backend/parser/analyze.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index b955b1f4928..3dbcd520986 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.253.2.2 2003/02/13 22:50:09 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.253.2.3 2007/06/20 18:21:51 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -793,6 +793,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
 {
 	bool		is_serial;
 	bool		saw_nullable;
+	bool		saw_default;
 	Constraint *constraint;
 	List	   *clist;
 
@@ -895,6 +896,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
 	transformConstraintAttrs(column->constraints);
 
 	saw_nullable = false;
+	saw_default = false;
 
 	foreach(clist, column->constraints)
 	{
@@ -935,11 +937,13 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
 				break;
 
 			case CONSTR_DEFAULT:
-				if (column->raw_default != NULL)
+				if (saw_default)
 					elog(ERROR, "%s/DEFAULT multiple values specified for '%s.%s'",
 						 cxt->stmtType, cxt->relation->relname, column->colname);
+				/* 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:


[parent: cbe8af81b215]