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

Commit377b37c

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 parent96e5951 commit377b37c

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
@@ -619,7 +619,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
619619

620620
QUOTE
621621

622-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFRESH REINDEX
622+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFRESH REINDEX
623623
RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
624624
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
625625
ROW ROWS RULE
@@ -12601,15 +12601,15 @@ xmlexists_argument:
1260112601
{
1260212602
$$ =$2;
1260312603
}
12604-
|PASSINGc_exprBYREF
12604+
|PASSINGc_exprBYREF_P
1260512605
{
1260612606
$$ =$2;
1260712607
}
12608-
|PASSINGBYREFc_expr
12608+
|PASSINGBYREF_Pc_expr
1260912609
{
1261012610
$$ =$4;
1261112611
}
12612-
|PASSINGBYREFc_exprBYREF
12612+
|PASSINGBYREF_Pc_exprBYREF_P
1261312613
{
1261412614
$$ =$4;
1261512615
}
@@ -13818,7 +13818,7 @@ unreserved_keyword:
1381813818
| REASSIGN
1381913819
| RECHECK
1382013820
| RECURSIVE
13821-
|REF
13821+
|REF_P
1382213822
| REFRESH
1382313823
| REINDEX
1382413824
| RELATIVE_P

‎src/include/parser/kwlist.h

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

0 commit comments

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