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

Commitbc7a40b

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 parenta2acafc commitbc7a40b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎src/backend/parser/gram.y

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

689689
QUOTE
690690

691-
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF REFERENCES REFERENCING
691+
RANGE READ REAL REASSIGN RECHECK RECURSIVEREF_P REFERENCES REFERENCING
692692
REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
693693
RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
694694
ROUTINE ROUTINES ROW ROWS RULE
@@ -14251,7 +14251,7 @@ xmlexists_argument:
1425114251
;
1425214252

1425314253
xml_passing_mech:
14254-
BYREF
14254+
BYREF_P
1425514255
|BYVALUE_P
1425614256
;
1425714257

@@ -15469,7 +15469,7 @@ unreserved_keyword:
1546915469
| REASSIGN
1547015470
| RECHECK
1547115471
| RECURSIVE
15472-
|REF
15472+
|REF_P
1547315473
| REFERENCING
1547415474
| REFRESH
1547515475
| REINDEX

‎src/include/parser/kwlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD)
330330
PG_KEYWORD("reassign",REASSIGN,UNRESERVED_KEYWORD)
331331
PG_KEYWORD("recheck",RECHECK,UNRESERVED_KEYWORD)
332332
PG_KEYWORD("recursive",RECURSIVE,UNRESERVED_KEYWORD)
333-
PG_KEYWORD("ref",REF,UNRESERVED_KEYWORD)
333+
PG_KEYWORD("ref",REF_P,UNRESERVED_KEYWORD)
334334
PG_KEYWORD("references",REFERENCES,RESERVED_KEYWORD)
335335
PG_KEYWORD("referencing",REFERENCING,UNRESERVED_KEYWORD)
336336
PG_KEYWORD("refresh",REFRESH,UNRESERVED_KEYWORD)

0 commit comments

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