Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9bfa043

Browse files
committed
Rename parser token REF to REF_P to avoid a symbol conflict.
In the latest version of Apple's macOS SDK, <sys/socket.h>fails to compile if "REF" is #define'd as something.Apple may or may not agree that this is a bug, and even ifthey do accept the bug report I filed, they probably won'tfix it very quickly. In the meantime, our back branches will allfail to compile gram.y. v15 and HEAD currently escape the problemthanks to the refactoring done in98e93a1, but that's purelyaccidental. Moreover, since that patch removed a widely-visibleinclusion of <netdb.h>, back-patching it seems too likely to breakthird-party code.Instead, change the token's code name to REF_P, following our usualconvention for naming parser tokens that are likely to have symbolconflicts. The effects of that should be localized to the grammarand immediately surrounding files, so it seems like a safer answer.Per project policy that we want to keep recently-out-of-supportbranches buildable on modern systems, back-patch all the way to 9.2.Discussion:https://postgr.es/m/1803927.1665938411@sss.pgh.pa.us
1 parentc705646 commit9bfa043

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎src/backend/parser/gram.y

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
621621

622622
QUOTE
623623

624-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFRESH REINDEX
624+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFRESH REINDEX
625625
RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
626626
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
627627
ROW ROWS RULE
@@ -12739,15 +12739,15 @@ xmlexists_argument:
1273912739
{
1274012740
$$ =$2;
1274112741
}
12742-
|PASSINGc_exprBYREF
12742+
|PASSINGc_exprBYREF_P
1274312743
{
1274412744
$$ =$2;
1274512745
}
12746-
|PASSINGBYREFc_expr
12746+
|PASSINGBYREF_Pc_expr
1274712747
{
1274812748
$$ =$4;
1274912749
}
12750-
|PASSINGBYREFc_exprBYREF
12750+
|PASSINGBYREF_Pc_exprBYREF_P
1275112751
{
1275212752
$$ =$4;
1275312753
}
@@ -13966,7 +13966,7 @@ unreserved_keyword:
1396613966
| REASSIGN
1396713967
| RECHECK
1396813968
| RECURSIVE
13969-
|REF
13969+
|REF_P
1397013970
| REFRESH
1397113971
| REINDEX
1397213972
| RELATIVE_P

‎src/include/parser/kwlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD)
311311
PG_KEYWORD("reassign",REASSIGN,UNRESERVED_KEYWORD)
312312
PG_KEYWORD("recheck",RECHECK,UNRESERVED_KEYWORD)
313313
PG_KEYWORD("recursive",RECURSIVE,UNRESERVED_KEYWORD)
314-
PG_KEYWORD("ref",REF,UNRESERVED_KEYWORD)
314+
PG_KEYWORD("ref",REF_P,UNRESERVED_KEYWORD)
315315
PG_KEYWORD("references",REFERENCES,RESERVED_KEYWORD)
316316
PG_KEYWORD("refresh",REFRESH,UNRESERVED_KEYWORD)
317317
PG_KEYWORD("reindex",REINDEX,UNRESERVED_KEYWORD)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp