Rename parser token REF to REF_P to avoid a symbol conflict.

tglsfdc · tglsfdc · commit ee4c44014400 · 2022-10-16T15:27:04.000-04:00
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 if they do accept the bug report I filed, they probably won't fix it very quickly. In the meantime, our back branches will all fail to compile gram.y. v15 and HEAD currently escape the problem thanks to the refactoring done in 98e93a1, but that's purely accidental. Moreover, since that patch removed a widely-visible inclusion of <netdb.h>, back-patching it seems too likely to break third-party code. Instead, change the token's code name to REF_P, following our usual convention for naming parser tokens that are likely to have symbol conflicts. The effects of that should be localized to the grammar and immediately surrounding files, so it seems like a safer answer. Per project policy that we want to keep recently-out-of-support branches buildable on modern systems, back-patch all the way to 9.2. Discussion: https://postgr.es/m/1803927.1665938411@sss.pgh.pa.us
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -569,7 +569,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
 	QUOTE
 
-	RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFRESH REINDEX
+	RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFRESH REINDEX
 	RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
 	RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK
 	ROW ROWS RULE
@@ -11789,15 +11789,15 @@ xmlexists_argument:
 				{
 					$$ = $2;
 				}
-			| PASSING c_expr BY REF
+			| PASSING c_expr BY REF_P
 				{
 					$$ = $2;
 				}
-			| PASSING BY REF c_expr
+			| PASSING BY REF_P c_expr
 				{
 					$$ = $4;
 				}
-			| PASSING BY REF c_expr BY REF
+			| PASSING BY REF_P c_expr BY REF_P
 				{
 					$$ = $4;
 				}
@@ -12898,7 +12898,7 @@ unreserved_keyword:
 			| REASSIGN
 			| RECHECK
 			| RECURSIVE
-			| REF
+			| REF_P
 			| REFRESH
 			| REINDEX
 			| RELATIVE_P
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
@@ -301,7 +301,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD)
 PG_KEYWORD("reassign", REASSIGN, UNRESERVED_KEYWORD)
 PG_KEYWORD("recheck", RECHECK, UNRESERVED_KEYWORD)
 PG_KEYWORD("recursive", RECURSIVE, UNRESERVED_KEYWORD)
-PG_KEYWORD("ref", REF, UNRESERVED_KEYWORD)
+PG_KEYWORD("ref", REF_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("references", REFERENCES, RESERVED_KEYWORD)
 PG_KEYWORD("refresh", REFRESH, UNRESERVED_KEYWORD)
 PG_KEYWORD("reindex", REINDEX, UNRESERVED_KEYWORD)

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`569`	`569`
`570`	`570`	`QUOTE`
`571`	`571`
`572`		`- RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFRESH REINDEX`
	`572`	`+ RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFRESH REINDEX`
`573`	`573`	`RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA`
`574`	`574`	`RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK`
`575`	`575`	`ROW ROWS RULE`
`@@ -11789,15 +11789,15 @@ xmlexists_argument:`
`11789`	`11789`	`{`
`11790`	`11790`	`$$ = $2;`
`11791`	`11791`	`}`
`11792`		`- \| PASSING c_expr BY REF`
	`11792`	`+ \| PASSING c_expr BY REF_P`
`11793`	`11793`	`{`
`11794`	`11794`	`$$ = $2;`
`11795`	`11795`	`}`
`11796`		`- \| PASSING BY REF c_expr`
	`11796`	`+ \| PASSING BY REF_P c_expr`
`11797`	`11797`	`{`
`11798`	`11798`	`$$ = $4;`
`11799`	`11799`	`}`
`11800`		`- \| PASSING BY REF c_expr BY REF`
	`11800`	`+ \| PASSING BY REF_P c_expr BY REF_P`
`11801`	`11801`	`{`
`11802`	`11802`	`$$ = $4;`
`11803`	`11803`	`}`
`@@ -12898,7 +12898,7 @@ unreserved_keyword:`
`12898`	`12898`	`\| REASSIGN`
`12899`	`12899`	`\| RECHECK`
`12900`	`12900`	`\| RECURSIVE`
`12901`		`- \| REF`
	`12901`	`+ \| REF_P`
`12902`	`12902`	`\| REFRESH`
`12903`	`12903`	`\| REINDEX`
`12904`	`12904`	`\| RELATIVE_P`