Enforces NOT NULL constraints to be applied against new PRIMARY KEY

columns in DefineIndex.  So, ALTER TABLE ... PRIMARY KEY will now
automatically add the NOT NULL constraint.  It appeared the alter_table
regression test wanted this to occur, as after the change the regression
test better matched in inline 'fails'/'succeeds' comments.

Rod Taylor

2 files changed, 58 insertions, 28 deletions

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index d46b7a389a3..df7e358b897 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.95 2002/12/15 16:17:39 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.96 2003/01/02 19:29:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,11 +19,13 @@
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/dependency.h"
+#include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_proc.h"
 #include "commands/defrem.h"
+#include "commands/tablecmds.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
@@ -166,6 +168,50 @@ DefineIndex(RangeVar *heapRelation,
 	}
 
 	/*
+	 * Check that all of the attributes in a primary key are marked
+	 * as not null, otherwise attempt to ALTER TABLE .. SET NOT NULL
+	 */
+	if (primary && !IsFuncIndex(attributeList))
+	{
+		List   *keys;
+
+		foreach(keys, attributeList)
+		{
+			IndexElem   *key = (IndexElem *) lfirst(keys);
+			HeapTuple	atttuple;
+
+			/* System attributes are never null, so no problem */
+			if (SystemAttributeByName(key->name, rel->rd_rel->relhasoids))
+				continue;
+
+			atttuple = SearchSysCacheAttName(relationId, key->name);
+			if (HeapTupleIsValid(atttuple))
+			{
+				if (! ((Form_pg_attribute) GETSTRUCT(atttuple))->attnotnull)
+				{
+					/*
+					 * Try to make it NOT NULL.
+					 *
+					 * XXX: Shouldn't the ALTER TABLE .. SET NOT NULL cascade
+					 * to child tables?  Currently, since the PRIMARY KEY
+					 * itself doesn't cascade, we don't cascade the notnull
+					 * constraint either; but this is pretty debatable.
+					 */
+					AlterTableAlterColumnSetNotNull(relationId, false,
+													key->name);
+				}
+				ReleaseSysCache(atttuple);
+			}
+			else
+			{
+				/* This shouldn't happen if parser did its job ... */
+				elog(ERROR, "DefineIndex: column \"%s\" named in key does not exist",
+					 key->name);
+			}
+		}
+	}
+
+	/*
 	 * Prepare arguments for index_create, primarily an IndexInfo
 	 * structure
 	 */
@@ -296,7 +342,7 @@ FuncIndexArgs(IndexInfo *indexInfo,
 
 		tuple = SearchSysCacheAttName(relId, arg);
 		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "DefineIndex: attribute \"%s\" not found", arg);
+			elog(ERROR, "DefineIndex: column \"%s\" named in key does not exist", arg);
 		att = (Form_pg_attribute) GETSTRUCT(tuple);
 		indexInfo->ii_KeyAttrNumbers[nargs] = att->attnum;
 		argTypes[nargs] = att->atttypid;
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index e771d666597..2609de18f54 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.258 2002/12/17 01:18:29 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.259 2003/01/02 19:29:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1083,7 +1083,9 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
 
 		/*
 		 * Make sure referenced keys exist.  If we are making a PRIMARY
-		 * KEY index, also make sure they are NOT NULL.
+		 * KEY index, also make sure they are NOT NULL, if possible.
+		 * (Although we could leave it to DefineIndex to mark the columns NOT
+		 * NULL, it's more efficient to get it right the first time.)
 		 */
 		foreach(keys, constraint->keys)
 		{
@@ -1142,25 +1144,12 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
 						if (strcmp(key, inhname) == 0)
 						{
 							found = true;
-
 							/*
-							 * If the column is inherited, we currently
-							 * have no easy way to force it to be NOT
-							 * NULL. Only way I can see to fix this would
-							 * be to convert the inherited-column info to
-							 * ColumnDef nodes before we reach this point,
-							 * and then create the table from those nodes
-							 * rather than referencing the parent tables
-							 * later.  That would likely be cleaner, but
-							 * too much work to contemplate right now.
-							 * Instead, raise an error if the inherited
-							 * column won't be NOT NULL. (Would a WARNING
-							 * be more reasonable?)
+							 * We currently have no easy way to force an
+							 * inherited column to be NOT NULL at creation, if
+							 * its parent wasn't so already.  We leave it to
+							 * DefineIndex to fix things up in this case.
 							 */
-							if (constraint->contype == CONSTR_PRIMARY &&
-								!inhattr->attnotnull)
-								elog(ERROR, "inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked NOT NULL",
-									 inhname);
 							break;
 						}
 					}
@@ -1178,15 +1167,10 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
 				if (HeapTupleIsValid(atttuple))
 				{
 					found = true;
-
 					/*
-					 * We require pre-existing column to be already marked
-					 * NOT NULL.
+					 * If it's not already NOT NULL, leave it to DefineIndex
+					 * to fix later.
 					 */
-					if (constraint->contype == CONSTR_PRIMARY &&
-						!((Form_pg_attribute) GETSTRUCT(atttuple))->attnotnull)
-						elog(ERROR, "Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked NOT NULL",
-							 key);
 					ReleaseSysCache(atttuple);
 				}
 			}