Revert some careless search-and-replace: "ADD" in comment text should

Neil Conway · Neil Conway · commit 12119188fe04 · 2005-12-29T04:53:18.000Z
not be replaced with "ADD_P".
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.520 2005/12/28 01:30:00 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.521 2005/12/29 04:53:18 neilc Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1304,7 +1304,7 @@ alter_table_cmds:
 
 /* Subcommands that are for ALTER TABLE only */
 alter_table_cmd:
-			/* ALTER TABLE <relation> ADD_P [COLUMN] <coldef> */
+			/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */
 			ADD_P opt_column columnDef
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -1377,7 +1377,7 @@ alter_table_cmd:
 					n->transform = $6;
 					$$ = (Node *)n;
 				}
-			/* ALTER TABLE <relation> ADD_P CONSTRAINT ... */
+			/* ALTER TABLE <relation> ADD CONSTRAINT ... */
 			| ADD_P TableConstraint
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -4767,7 +4767,7 @@ AlterDomainStmt:
 					n->typename = $3;
 					$$ = (Node *)n;
 				}
-			/* ALTER DOMAIN <domain> ADD_P CONSTRAINT ... */
+			/* ALTER DOMAIN <domain> ADD CONSTRAINT ... */
 			| ALTER DOMAIN_P any_name ADD_P TableConstraint
 				{
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.314 2005/12/27 04:00:08 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.315 2005/12/29 04:53:18 neilc Exp $ */
 
 /* Copyright comment */
 %{
@@ -1245,7 +1245,7 @@ alter_table_cmds:
 
 alter_table_cmd:
 		ADD_P opt_column columnDef
-/* ALTER TABLE <relation> ADD_P [COLUMN] <coldef> */
+/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */
 			{ $$ = cat_str(3, make_str("add"), $2, $3); }
 /* ALTER TABLE <relation> ALTER [COLUMN] <colname> {SET DEFAULT <expr>|DROP DEFAULT} */
 		| ALTER opt_column ColId alter_column_default
@@ -1268,7 +1268,7 @@ alter_table_cmd:
 /* ALTER TABLE <relation> ALTER [COLUMN] <colname> TYPE <typename> [ USING <expression> ] */
 		| ALTER opt_column ColId TYPE_P Typename alter_using
 			{ $$ = cat_str(6, make_str("alter"), $2, $3, make_str("type"), $5, $6); }
-/* ALTER TABLE <relation> ADD_P CONSTRAINT ... */
+/* ALTER TABLE <relation> ADD CONSTRAINT ... */
 		| ADD_P TableConstraint
 			{ $$ = cat_str(2, make_str("add"), $2); }
 /* ALTER TABLE <relation> DROP CONSTRAINT ... */

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.520 2005/12/28 01:30:00 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.521 2005/12/29 04:53:18 neilc Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1304,7 +1304,7 @@ alter_table_cmds:`
`1304`	`1304`
`1305`	`1305`	`/* Subcommands that are for ALTER TABLE only */`
`1306`	`1306`	`alter_table_cmd:`
`1307`		`- /* ALTER TABLE <relation> ADD_P [COLUMN] <coldef> */`
	`1307`	`+ /* ALTER TABLE <relation> ADD [COLUMN] <coldef> */`
`1308`	`1308`	`ADD_P opt_column columnDef`
`1309`	`1309`	`{`
`1310`	`1310`	`AlterTableCmd *n = makeNode(AlterTableCmd);`
`@@ -1377,7 +1377,7 @@ alter_table_cmd:`
`1377`	`1377`	`n->transform = $6;`
`1378`	`1378`	`$$ = (Node *)n;`
`1379`	`1379`	`}`
`1380`		`- /* ALTER TABLE <relation> ADD_P CONSTRAINT ... */`
	`1380`	`+ /* ALTER TABLE <relation> ADD CONSTRAINT ... */`
`1381`	`1381`	`\| ADD_P TableConstraint`
`1382`	`1382`	`{`
`1383`	`1383`	`AlterTableCmd *n = makeNode(AlterTableCmd);`
`@@ -4767,7 +4767,7 @@ AlterDomainStmt:`
`4767`	`4767`	`n->typename = $3;`
`4768`	`4768`	`$$ = (Node *)n;`
`4769`	`4769`	`}`
`4770`		`- /* ALTER DOMAIN <domain> ADD_P CONSTRAINT ... */`
	`4770`	`+ /* ALTER DOMAIN <domain> ADD CONSTRAINT ... */`
`4771`	`4771`	`\| ALTER DOMAIN_P any_name ADD_P TableConstraint`
`4772`	`4772`	`{`
`4773`	`4773`	`AlterDomainStmt *n = makeNode(AlterDomainStmt);`