From a4a4b8bb023bca92791fd43a6ee3a61fd9ba98b0 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 27 Dec 2005 04:00:08 +0000 Subject: [PATCH] Protect ADD and HEADER symbols from conflicting with MIPS includes. --- src/backend/parser/gram.y | 26 +++++++++++++------------- src/backend/parser/keywords.c | 6 +++--- src/interfaces/ecpg/preproc/keywords.c | 6 +++--- src/interfaces/ecpg/preproc/preproc.y | 24 ++++++++++++------------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 4a006bd169..6c0145e298 100644 --- 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.518 2005/12/23 16:46:39 petere Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.519 2005/12/27 04:00:07 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -335,7 +335,7 @@ static void doNegateFloat(Value *v); */ /* ordinary key words in alphabetical order */ -%token ABORT_P ABSOLUTE_P ACCESS ACTION ADD ADMIN AFTER +%token ABORT_P ABSOLUTE_P ACCESS ACTION ADD_P ADMIN AFTER AGGREGATE ALL ALSO ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION @@ -361,7 +361,7 @@ static void doNegateFloat(Value *v); GLOBAL GRANT GRANTED GREATEST GROUP_P - HANDLER HAVING HEADER HOLD HOUR_P + HANDLER HAVING HEADER_P HOLD HOUR_P IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IN_P INCLUDING INCREMENT INDEX INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P @@ -882,7 +882,7 @@ AlterGroupStmt: } ; -add_drop: ADD { $$ = +1; } +add_drop: ADD_P { $$ = +1; } | DROP { $$ = -1; } ; @@ -1304,8 +1304,8 @@ alter_table_cmds: /* Subcommands that are for ALTER TABLE only */ alter_table_cmd: - /* ALTER TABLE ADD [COLUMN] */ - ADD opt_column columnDef + /* ALTER TABLE ADD_P [COLUMN] */ + ADD_P opt_column columnDef { AlterTableCmd *n = makeNode(AlterTableCmd); n->subtype = AT_AddColumn; @@ -1377,8 +1377,8 @@ alter_table_cmd: n->transform = $6; $$ = (Node *)n; } - /* ALTER TABLE ADD CONSTRAINT ... */ - | ADD TableConstraint + /* ALTER TABLE ADD_P CONSTRAINT ... */ + | ADD_P TableConstraint { AlterTableCmd *n = makeNode(AlterTableCmd); n->subtype = AT_AddConstraint; @@ -1619,7 +1619,7 @@ copy_opt_item: { $$ = makeDefElem("csv", (Node *)makeInteger(TRUE)); } - | HEADER + | HEADER_P { $$ = makeDefElem("header", (Node *)makeInteger(TRUE)); } @@ -4767,8 +4767,8 @@ AlterDomainStmt: n->typename = $3; $$ = (Node *)n; } - /* ALTER DOMAIN ADD CONSTRAINT ... */ - | ALTER DOMAIN_P any_name ADD TableConstraint + /* ALTER DOMAIN ADD_P CONSTRAINT ... */ + | ALTER DOMAIN_P any_name ADD_P TableConstraint { AlterDomainStmt *n = makeNode(AlterDomainStmt); n->subtype = 'C'; @@ -8137,7 +8137,7 @@ unreserved_keyword: | ABSOLUTE_P | ACCESS | ACTION - | ADD + | ADD_P | ADMIN | AFTER | AGGREGATE @@ -8204,7 +8204,7 @@ unreserved_keyword: | GLOBAL | GRANTED | HANDLER - | HEADER + | HEADER_P | HOLD | HOUR_P | IF_P diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index b784d66468..c11a1cf9b0 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.169 2005/11/22 18:17:15 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.170 2005/12/27 04:00:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ static const ScanKeyword ScanKeywords[] = { {"absolute", ABSOLUTE_P}, {"access", ACCESS}, {"action", ACTION}, - {"add", ADD}, + {"add", ADD_P}, {"admin", ADMIN}, {"after", AFTER}, {"aggregate", AGGREGATE}, @@ -157,7 +157,7 @@ static const ScanKeyword ScanKeywords[] = { {"group", GROUP_P}, {"handler", HANDLER}, {"having", HAVING}, - {"header", HEADER}, + {"header", HEADER_P}, {"hold", HOLD}, {"hour", HOUR_P}, {"if", IF_P}, diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 06d9596790..4d1f83da02 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.70 2005/10/15 02:49:47 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.71 2005/12/27 04:00:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ static ScanKeyword ScanKeywords[] = { {"absolute", ABSOLUTE_P}, {"access", ACCESS}, {"action", ACTION}, - {"add", ADD}, + {"add", ADD_P}, {"admin", ADMIN}, {"after", AFTER}, {"aggregate", AGGREGATE}, @@ -155,7 +155,7 @@ static ScanKeyword ScanKeywords[] = { {"group", GROUP_P}, {"handler", HANDLER}, {"having", HAVING}, - {"header", HEADER}, + {"header", HEADER_P}, {"hold", HOLD}, {"hour", HOUR_P}, {"ilike", ILIKE}, diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 3317e9e8f7..39699e8e77 100644 --- 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.313 2005/12/02 15:03:57 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.314 2005/12/27 04:00:08 momjian Exp $ */ /* Copyright comment */ %{ @@ -349,7 +349,7 @@ add_additional_variables(char *name, bool insert) %token TYPECAST /* ordinary key words in alphabetical order */ -%token ABORT_P ABSOLUTE_P ACCESS ACTION ADD ADMIN AFTER +%token ABORT_P ABSOLUTE_P ACCESS ACTION ADD_P ADMIN AFTER AGGREGATE ALL ALSO ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION @@ -375,7 +375,7 @@ add_additional_variables(char *name, bool insert) GET GLOBAL GRANT GRANTED GREATEST GROUP_P - HANDLER HAVING HEADER HOLD HOUR_P + HANDLER HAVING HEADER_P HOLD HOUR_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IN_P INCLUDING INCREMENT INDEX INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P @@ -1032,7 +1032,7 @@ AlterGroupStmt: ALTER GROUP_P RoleId add_drop USER name_list { $$ = cat_str(5, make_str("alter group"), $3, $4, make_str("user"), $6); } ; -add_drop: ADD { $$ = make_str("add"); } +add_drop: ADD_P { $$ = make_str("add"); } | DROP { $$ = make_str("drop"); } ; @@ -1244,8 +1244,8 @@ alter_table_cmds: ; alter_table_cmd: - ADD opt_column columnDef -/* ALTER TABLE ADD [COLUMN] */ + ADD_P opt_column columnDef +/* ALTER TABLE ADD_P [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,8 +1268,8 @@ 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 CONSTRAINT ... */ - | ADD TableConstraint +/* ALTER TABLE ADD_P CONSTRAINT ... */ + | ADD_P TableConstraint { $$ = cat_str(2, make_str("add"), $2); } /* ALTER TABLE DROP CONSTRAINT ... */ | DROP CONSTRAINT name opt_drop_behavior @@ -1385,7 +1385,7 @@ copy_opt_item: BINARY { $$ = make_str("binary"); } | NULL_P opt_as StringConst { $$ = cat_str(3, make_str("null"), $2, $3); } | CSV { $$ = make_str("csv"); } - | HEADER { $$ = make_str("header"); } + | HEADER_P { $$ = make_str("header"); } | QUOTE opt_as Sconst { $$ = cat_str(3, make_str("quote"), $2, $3); } | ESCAPE opt_as Sconst @@ -2847,7 +2847,7 @@ AlterDomainStmt: { $$ = cat_str(3, make_str("alter domain"), $3, make_str("drop not null")); } | ALTER DOMAIN_P any_name SET NOT NULL_P { $$ = cat_str(3, make_str("alter domain"), $3, make_str("set not null")); } - | ALTER DOMAIN_P any_name ADD TableConstraint + | ALTER DOMAIN_P any_name ADD_P TableConstraint { $$ = cat_str(4, make_str("alter domain"), $3, make_str("add"), $5); } | ALTER DOMAIN_P any_name DROP CONSTRAINT name opt_drop_behavior { $$ = cat_str(5, make_str("alter domain"), $3, make_str("drop constraint"), $6, $7); } @@ -6044,7 +6044,7 @@ ECPGunreserved_con: ABORT_P { $$ = make_str("abort"); } | ABSOLUTE_P { $$ = make_str("absolute"); } | ACCESS { $$ = make_str("access"); } | ACTION { $$ = make_str("action"); } - | ADD { $$ = make_str("add"); } + | ADD_P { $$ = make_str("add"); } | ADMIN { $$ = make_str("admin"); } | AFTER { $$ = make_str("after"); } | AGGREGATE { $$ = make_str("aggregate"); } @@ -6108,7 +6108,7 @@ ECPGunreserved_con: ABORT_P { $$ = make_str("abort"); } | GLOBAL { $$ = make_str("global"); } | GRANTED { $$ = make_str("granted"); } | HANDLER { $$ = make_str("handler"); } - | HEADER { $$ = make_str("header"); } + | HEADER_P { $$ = make_str("header"); } | HOLD { $$ = make_str("hold"); } /* | HOUR_P { $$ = make_str("hour"); }*/ | IMMEDIATE { $$ = make_str("immediate"); }