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

not be replaced with "ADD_P".

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 201a972e098ba4cfa02500dae6d35a9fbbbacb79..ceb7143ce26e86e22afe29daa70300402b0987a7 100644 (file)
--- 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  ADD_P [COLUMN]  */
+           /* ALTER TABLE  ADD [COLUMN]  */
            ADD_P opt_column columnDef
                {
                    AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -1377,7 +1377,7 @@ alter_table_cmd:
                    n->transform = $6;
                    $$ = (Node *)n;
                }
-           /* ALTER TABLE  ADD_P CONSTRAINT ... */
+           /* ALTER TABLE  ADD CONSTRAINT ... */
            | ADD_P TableConstraint
                {
                    AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -4767,7 +4767,7 @@ AlterDomainStmt:
                    n->typename = $3;
                    $$ = (Node *)n;
                }
-           /* ALTER DOMAIN  ADD_P CONSTRAINT ... */
+           /* ALTER 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
index 39699e8e77174a1bfbd8d4ffd7eeaff19219ba36..21fbb104ff72b455e1f9bba217cc259f550abe0b 100644 (file)
--- 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  ADD_P [COLUMN]  */
+/* ALTER TABLE  ADD [COLUMN]  */
            { $$ = cat_str(3, make_str("add"), $2, $3); }
 /* ALTER TABLE  ALTER [COLUMN]  {SET DEFAULT |DROP DEFAULT} */
        | ALTER opt_column ColId alter_column_default
@@ -1268,7 +1268,7 @@ alter_table_cmd:
 /* ALTER TABLE  ALTER [COLUMN]  TYPE  [ USING  ] */
        | ALTER opt_column ColId TYPE_P Typename alter_using
            { $$ = cat_str(6, make_str("alter"), $2, $3, make_str("type"), $5, $6); }
-/* ALTER TABLE  ADD_P CONSTRAINT ... */
+/* ALTER TABLE  ADD CONSTRAINT ... */
        | ADD_P TableConstraint
            { $$ = cat_str(2, make_str("add"), $2); }
 /* ALTER TABLE  DROP CONSTRAINT ... */