Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a4a4b8b

Browse files
bmomjianbmomjian
committed
Protect ADD and HEADER symbols from conflicting with MIPS includes.
1 parent a2384d0 commit a4a4b8b

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎src/backend/parser/gram.y

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.518 2005/12/23 16:46:39 petere Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.519 2005/12/27 04:00:07 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -335,7 +335,7 @@ static void doNegateFloat(Value *v);
335335
*/
336336

337337
/* ordinary key words in alphabetical order */
338-
%token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ADD ADMIN AFTER
338+
%token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ADD_P ADMIN AFTER
339339
AGGREGATE ALL ALSO ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC
340340
ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION
341341

@@ -361,7 +361,7 @@ static void doNegateFloat(Value *v);
361361

362362
GLOBAL GRANT GRANTED GREATEST GROUP_P
363363

364-
HANDLER HAVING HEADER HOLD HOUR_P
364+
HANDLER HAVING HEADER_P HOLD HOUR_P
365365

366366
IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IN_P INCLUDING INCREMENT
367367
INDEX INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P
@@ -882,7 +882,7 @@ AlterGroupStmt:
882882
}
883883
;
884884

885-
add_drop: ADD { $$ = +1; }
885+
add_drop: ADD_P { $$ = +1; }
886886
| DROP { $$ = -1; }
887887
;
888888

@@ -1304,8 +1304,8 @@ alter_table_cmds:
13041304

13051305
/* Subcommands that are for ALTER TABLE only */
13061306
alter_table_cmd:
1307-
/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */
1308-
ADD opt_column columnDef
1307+
/* ALTER TABLE <relation> ADD_P [COLUMN] <coldef> */
1308+
ADD_P opt_column columnDef
13091309
{
13101310
AlterTableCmd *n = makeNode(AlterTableCmd);
13111311
n->subtype = AT_AddColumn;
@@ -1377,8 +1377,8 @@ alter_table_cmd:
13771377
n->transform = $6;
13781378
$$ = (Node *)n;
13791379
}
1380-
/* ALTER TABLE <relation> ADD CONSTRAINT ... */
1381-
| ADD TableConstraint
1380+
/* ALTER TABLE <relation> ADD_P CONSTRAINT ... */
1381+
| ADD_P TableConstraint
13821382
{
13831383
AlterTableCmd *n = makeNode(AlterTableCmd);
13841384
n->subtype = AT_AddConstraint;
@@ -1619,7 +1619,7 @@ copy_opt_item:
16191619
{
16201620
$$ = makeDefElem("csv", (Node *)makeInteger(TRUE));
16211621
}
1622-
| HEADER
1622+
| HEADER_P
16231623
{
16241624
$$ = makeDefElem("header", (Node *)makeInteger(TRUE));
16251625
}
@@ -4767,8 +4767,8 @@ AlterDomainStmt:
47674767
n->typename = $3;
47684768
$$ = (Node *)n;
47694769
}
4770-
/* ALTER DOMAIN <domain> ADD CONSTRAINT ... */
4771-
| ALTER DOMAIN_P any_name ADD TableConstraint
4770+
/* ALTER DOMAIN <domain> ADD_P CONSTRAINT ... */
4771+
| ALTER DOMAIN_P any_name ADD_P TableConstraint
47724772
{
47734773
AlterDomainStmt *n = makeNode(AlterDomainStmt);
47744774
n->subtype = 'C';
@@ -8137,7 +8137,7 @@ unreserved_keyword:
81378137
| ABSOLUTE_P
81388138
| ACCESS
81398139
| ACTION
8140-
| ADD
8140+
| ADD_P
81418141
| ADMIN
81428142
| AFTER
81438143
| AGGREGATE
@@ -8204,7 +8204,7 @@ unreserved_keyword:
82048204
| GLOBAL
82058205
| GRANTED
82068206
| HANDLER
8207-
| HEADER
8207+
| HEADER_P
82088208
| HOLD
82098209
| HOUR_P
82108210
| IF_P

‎src/backend/parser/keywords.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.169 2005/11/22 18:17:15 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.170 2005/12/27 04:00:07 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -34,7 +34,7 @@ static const ScanKeyword ScanKeywords[] = {
3434
{"absolute", ABSOLUTE_P},
3535
{"access", ACCESS},
3636
{"action", ACTION},
37-
{"add", ADD},
37+
{"add", ADD_P},
3838
{"admin", ADMIN},
3939
{"after", AFTER},
4040
{"aggregate", AGGREGATE},
@@ -157,7 +157,7 @@ static const ScanKeyword ScanKeywords[] = {
157157
{"group", GROUP_P},
158158
{"handler", HANDLER},
159159
{"having", HAVING},
160-
{"header", HEADER},
160+
{"header", HEADER_P},
161161
{"hold", HOLD},
162162
{"hour", HOUR_P},
163163
{"if", IF_P},

‎src/interfaces/ecpg/preproc/keywords.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.70 2005/10/15 02:49:47 momjian Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.71 2005/12/27 04:00:08 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -32,7 +32,7 @@ static ScanKeyword ScanKeywords[] = {
3232
{"absolute", ABSOLUTE_P},
3333
{"access", ACCESS},
3434
{"action", ACTION},
35-
{"add", ADD},
35+
{"add", ADD_P},
3636
{"admin", ADMIN},
3737
{"after", AFTER},
3838
{"aggregate", AGGREGATE},
@@ -155,7 +155,7 @@ static ScanKeyword ScanKeywords[] = {
155155
{"group", GROUP_P},
156156
{"handler", HANDLER},
157157
{"having", HAVING},
158-
{"header", HEADER},
158+
{"header", HEADER_P},
159159
{"hold", HOLD},
160160
{"hour", HOUR_P},
161161
{"ilike", ILIKE},

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.313 2005/12/02 15:03:57 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.314 2005/12/27 04:00:08 momjian Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -349,7 +349,7 @@ add_additional_variables(char *name, bool insert)
349349
%token TYPECAST
350350

351351
/* ordinary key words in alphabetical order */
352-
%token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ADD ADMIN AFTER
352+
%token <keyword> ABORT_P ABSOLUTE_P ACCESS ACTION ADD_P ADMIN AFTER
353353
AGGREGATE ALL ALSO ALTER ANALYSE ANALYZE AND ANY ARRAY AS ASC
354354
ASSERTION ASSIGNMENT ASYMMETRIC AT AUTHORIZATION
355355

@@ -375,7 +375,7 @@ add_additional_variables(char *name, bool insert)
375375

376376
GET GLOBAL GRANT GRANTED GREATEST GROUP_P
377377

378-
HANDLER HAVING HEADER HOLD HOUR_P
378+
HANDLER HAVING HEADER_P HOLD HOUR_P
379379

380380
ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IN_P INCLUDING INCREMENT
381381
INDEX INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P
@@ -1032,7 +1032,7 @@ AlterGroupStmt: ALTER GROUP_P RoleId add_drop USER name_list
10321032
{ $$ = cat_str(5, make_str("alter group"), $3, $4, make_str("user"), $6); }
10331033
;
10341034

1035-
add_drop: ADD { $$ = make_str("add"); }
1035+
add_drop: ADD_P { $$ = make_str("add"); }
10361036
| DROP { $$ = make_str("drop"); }
10371037
;
10381038

@@ -1244,8 +1244,8 @@ alter_table_cmds:
12441244
;
12451245

12461246
alter_table_cmd:
1247-
ADD opt_column columnDef
1248-
/* ALTER TABLE <relation> ADD [COLUMN] <coldef> */
1247+
ADD_P opt_column columnDef
1248+
/* ALTER TABLE <relation> ADD_P [COLUMN] <coldef> */
12491249
{ $$ = cat_str(3, make_str("add"), $2, $3); }
12501250
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> {SET DEFAULT <expr>|DROP DEFAULT} */
12511251
| ALTER opt_column ColId alter_column_default
@@ -1268,8 +1268,8 @@ alter_table_cmd:
12681268
/* ALTER TABLE <relation> ALTER [COLUMN] <colname> TYPE <typename> [ USING <expression> ] */
12691269
| ALTER opt_column ColId TYPE_P Typename alter_using
12701270
{ $$ = cat_str(6, make_str("alter"), $2, $3, make_str("type"), $5, $6); }
1271-
/* ALTER TABLE <relation> ADD CONSTRAINT ... */
1272-
| ADD TableConstraint
1271+
/* ALTER TABLE <relation> ADD_P CONSTRAINT ... */
1272+
| ADD_P TableConstraint
12731273
{ $$ = cat_str(2, make_str("add"), $2); }
12741274
/* ALTER TABLE <relation> DROP CONSTRAINT ... */
12751275
| DROP CONSTRAINT name opt_drop_behavior
@@ -1385,7 +1385,7 @@ copy_opt_item: BINARY { $$ = make_str("binary"); }
13851385
| NULL_P opt_as StringConst
13861386
{ $$ = cat_str(3, make_str("null"), $2, $3); }
13871387
| CSV { $$ = make_str("csv"); }
1388-
| HEADER { $$ = make_str("header"); }
1388+
| HEADER_P { $$ = make_str("header"); }
13891389
| QUOTE opt_as Sconst
13901390
{ $$ = cat_str(3, make_str("quote"), $2, $3); }
13911391
| ESCAPE opt_as Sconst
@@ -2847,7 +2847,7 @@ AlterDomainStmt:
28472847
{ $$ = cat_str(3, make_str("alter domain"), $3, make_str("drop not null")); }
28482848
| ALTER DOMAIN_P any_name SET NOT NULL_P
28492849
{ $$ = cat_str(3, make_str("alter domain"), $3, make_str("set not null")); }
2850-
| ALTER DOMAIN_P any_name ADD TableConstraint
2850+
| ALTER DOMAIN_P any_name ADD_P TableConstraint
28512851
{ $$ = cat_str(4, make_str("alter domain"), $3, make_str("add"), $5); }
28522852
| ALTER DOMAIN_P any_name DROP CONSTRAINT name opt_drop_behavior
28532853
{ $$ = 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"); }
60446044
| ABSOLUTE_P { $$ = make_str("absolute"); }
60456045
| ACCESS { $$ = make_str("access"); }
60466046
| ACTION { $$ = make_str("action"); }
6047-
| ADD { $$ = make_str("add"); }
6047+
| ADD_P { $$ = make_str("add"); }
60486048
| ADMIN { $$ = make_str("admin"); }
60496049
| AFTER { $$ = make_str("after"); }
60506050
| AGGREGATE { $$ = make_str("aggregate"); }
@@ -6108,7 +6108,7 @@ ECPGunreserved_con: ABORT_P { $$ = make_str("abort"); }
61086108
| GLOBAL { $$ = make_str("global"); }
61096109
| GRANTED { $$ = make_str("granted"); }
61106110
| HANDLER { $$ = make_str("handler"); }
6111-
| HEADER { $$ = make_str("header"); }
6111+
| HEADER_P { $$ = make_str("header"); }
61126112
| HOLD { $$ = make_str("hold"); }
61136113
/* | HOUR_P { $$ = make_str("hour"); }*/
61146114
| IMMEDIATE { $$ = make_str("immediate"); }

0 commit comments

Comments
 (0)