Code review for ALTER INDEX patch.

tglsfdc · tglsfdc · commit 37d937ea2c06 · 2004-08-22T00:08:28.000Z
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.8 2004/06/25 21:55:53 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.9 2004/08/22 00:08:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -89,6 +89,7 @@ ExecRenameStmt(RenameStmt *stmt)
 			break;
 
 		case OBJECT_TABLE:
+		case OBJECT_INDEX:
 		case OBJECT_COLUMN:
 		case OBJECT_TRIGGER:
 			{
@@ -101,6 +102,7 @@ ExecRenameStmt(RenameStmt *stmt)
 				switch (stmt->renameType)
 				{
 					case OBJECT_TABLE:
+					case OBJECT_INDEX:
 						{
 							/*
 							 * RENAME TABLE requires that we (still) hold
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.289 2004/08/02 04:26:05 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.290 2004/08/22 00:08:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1626,6 +1626,7 @@ _copyAlterTableStmt(AlterTableStmt *from)
 
 	COPY_NODE_FIELD(relation);
 	COPY_NODE_FIELD(cmds);
+	COPY_SCALAR_FIELD(relkind);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.228 2004/08/02 04:26:05 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.229 2004/08/22 00:08:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -727,6 +727,7 @@ _equalAlterTableStmt(AlterTableStmt *a, AlterTableStmt *b)
 {
 	COMPARE_NODE_FIELD(relation);
 	COMPARE_NODE_FIELD(cmds);
+	COMPARE_SCALAR_FIELD(relkind);
 
 	return true;
 }
diff --git 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
  *
- *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.308 2004/08/02 04:26:29 tgl Exp $
+ *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.309 2004/08/22 00:08:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1421,6 +1421,7 @@ transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt,
 
 		alterstmt->relation = cxt->relation;
 		alterstmt->cmds = NIL;
+		alterstmt->relkind = OBJECT_TABLE;
 
 		foreach(fkclist, cxt->fkconstraints)
 		{
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.472 2004/08/20 04:29:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.473 2004/08/22 00:08:28 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1166,6 +1166,7 @@ alter_table_cmds:
 			| alter_table_cmds ',' alter_table_cmd	{ $$ = lappend($1, $3); }
 		;
 
+/* Subcommands that are for ALTER TABLE only */
 alter_table_cmd:
 			/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */
 			ADD opt_column columnDef
@@ -1293,21 +1294,22 @@ alter_table_cmd:
 				}
 		;
 
-alter_rel_cmds: alter_rel_cmd                         { $$ = list_make1($1); }
-            | alter_rel_cmds ',' alter_rel_cmd  { $$ = lappend($1, $3); }
-        ;
-
+alter_rel_cmds:
+			alter_rel_cmd							{ $$ = list_make1($1); }
+			| alter_rel_cmds ',' alter_rel_cmd		{ $$ = lappend($1, $3); }
+		;
 
+/* Subcommands that are for ALTER TABLE or ALTER INDEX */
 alter_rel_cmd:
-			/* ALTER [ TABLE | INDEX ] <name> OWNER TO UserId */
+			/* ALTER [TABLE|INDEX] <name> OWNER TO UserId */
 			OWNER TO UserId
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					n->subtype = AT_ChangeOwner;
 					n->name = $3;
 					$$ = (Node *)n;
 				}
-			/* ALTER [ TABLE | INDEX ] <name> SET TABLESPACE <tablespacename> */
+			/* ALTER [TABLE|INDEX] <name> SET TABLESPACE <tablespacename> */
 			| SET TABLESPACE name
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.8 2004/06/25 21:55:53 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.9 2004/08/22 00:08:27 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -89,6 +89,7 @@ ExecRenameStmt(RenameStmt *stmt)`
`89`	`89`	`break;`
`90`	`90`
`91`	`91`	`case OBJECT_TABLE:`
	`92`	`+ case OBJECT_INDEX:`
`92`	`93`	`case OBJECT_COLUMN:`
`93`	`94`	`case OBJECT_TRIGGER:`
`94`	`95`	`{`
`@@ -101,6 +102,7 @@ ExecRenameStmt(RenameStmt *stmt)`
`101`	`102`	`switch (stmt->renameType)`
`102`	`103`	`{`
`103`	`104`	`case OBJECT_TABLE:`
	`105`	`+ case OBJECT_INDEX:`
`104`	`106`	`{`
`105`	`107`	`/*`
`106`	`108`	`* RENAME TABLE requires that we (still) hold`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* Portions Copyright (c) 1994, Regents of the University of California`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.289 2004/08/02 04:26:05 tgl Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.290 2004/08/22 00:08:28 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -1626,6 +1626,7 @@ _copyAlterTableStmt(AlterTableStmt *from)`
`1626`	`1626`
`1627`	`1627`	`COPY_NODE_FIELD(relation);`
`1628`	`1628`	`COPY_NODE_FIELD(cmds);`
	`1629`	`+ COPY_SCALAR_FIELD(relkind);`
`1629`	`1630`
`1630`	`1631`	`return newnode;`
`1631`	`1632`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* Portions Copyright (c) 1994, Regents of the University of California`
`19`	`19`	`*`
`20`	`20`	`* IDENTIFICATION`
`21`		`- * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.228 2004/08/02 04:26:05 tgl Exp $`
	`21`	`+ * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.229 2004/08/22 00:08:28 tgl Exp $`
`22`	`22`	`*`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`@@ -727,6 +727,7 @@ _equalAlterTableStmt(AlterTableStmt a, AlterTableStmt b)`
`727`	`727`	`{`
`728`	`728`	`COMPARE_NODE_FIELD(relation);`
`729`	`729`	`COMPARE_NODE_FIELD(cmds);`
	`730`	`+ COMPARE_SCALAR_FIELD(relkind);`
`730`	`731`
`731`	`732`	`return true;`
`732`	`733`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.308 2004/08/02 04:26:29 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.309 2004/08/22 00:08:28 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -1421,6 +1421,7 @@ transformFKConstraints(ParseState pstate, CreateStmtContext cxt,`
`1421`	`1421`
`1422`	`1422`	`alterstmt->relation = cxt->relation;`
`1423`	`1423`	`alterstmt->cmds = NIL;`
	`1424`	`+ alterstmt->relkind = OBJECT_TABLE;`
`1424`	`1425`
`1425`	`1426`	`foreach(fkclist, cxt->fkconstraints)`
`1426`	`1427`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.472 2004/08/20 04:29:32 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.473 2004/08/22 00:08:28 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1166,6 +1166,7 @@ alter_table_cmds:`
`1166`	`1166`	`\| alter_table_cmds ',' alter_table_cmd { $$ = lappend($1, $3); }`
`1167`	`1167`	`;`
`1168`	`1168`
	`1169`	`+/* Subcommands that are for ALTER TABLE only */`
`1169`	`1170`	`alter_table_cmd:`
`1170`	`1171`	`/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */`
`1171`	`1172`	`ADD opt_column columnDef`
`@@ -1293,21 +1294,22 @@ alter_table_cmd:`
`1293`	`1294`	`}`
`1294`	`1295`	`;`
`1295`	`1296`
`1296`		`-alter_rel_cmds: alter_rel_cmd { $$ = list_make1($1); }`
`1297`		`- \| alter_rel_cmds ',' alter_rel_cmd { $$ = lappend($1, $3); }`
`1298`		`- ;`
`1299`		`-`
	`1297`	`+alter_rel_cmds:`
	`1298`	`+ alter_rel_cmd { $$ = list_make1($1); }`
	`1299`	`+ \| alter_rel_cmds ',' alter_rel_cmd { $$ = lappend($1, $3); }`
	`1300`	`+ ;`
`1300`	`1301`
	`1302`	`+/* Subcommands that are for ALTER TABLE or ALTER INDEX */`
`1301`	`1303`	`alter_rel_cmd:`
`1302`		`- /* ALTER [ TABLE \| INDEX ] <name> OWNER TO UserId */`
	`1304`	`+ /* ALTER [TABLE\|INDEX] <name> OWNER TO UserId */`
`1303`	`1305`	`OWNER TO UserId`
`1304`	`1306`	`{`
`1305`	`1307`	`AlterTableCmd *n = makeNode(AlterTableCmd);`
`1306`	`1308`	`n->subtype = AT_ChangeOwner;`
`1307`	`1309`	`n->name = $3;`
`1308`	`1310`	`$$ = (Node *)n;`
`1309`	`1311`	`}`
`1310`		`- /* ALTER [ TABLE \| INDEX ] <name> SET TABLESPACE <tablespacename> */`
	`1312`	`+ /* ALTER [TABLE\|INDEX] <name> SET TABLESPACE <tablespacename> */`
`1311`	`1313`	`\| SET TABLESPACE name`
`1312`	`1314`	`{`
`1313`	`1315`	`AlterTableCmd *n = makeNode(AlterTableCmd);`