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

In the latest version of Apple's macOS SDK, 
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 98e93a1fc, but that's purely
accidental.  Moreover, since that patch removed a widely-visible
inclusion of , 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
index 94d5142a4a0639f63f1e46bf59da01221a84e06d..737bd2d06d54dbbc4d9a3e3696ece68f53d68124 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -734,7 +734,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
    QUOTE
 
-   RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFERENCING
+   RANGE READ REAL REASSIGN RECHECK RECURSIVE REF_P REFERENCES REFERENCING
    REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
    RESET RESTART RESTRICT RETURN RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
    ROUTINE ROUTINES ROW ROWS RULE
@@ -15553,7 +15553,7 @@ xmlexists_argument:
        ;
 
 xml_passing_mech:
-           BY REF
+           BY REF_P
            | BY VALUE_P
        ;
 
@@ -16854,7 +16854,7 @@ unreserved_keyword:
            | REASSIGN
            | RECHECK
            | RECURSIVE
-           | REF
+           | REF_P
            | REFERENCING
            | REFRESH
            | REINDEX
@@ -17440,7 +17440,7 @@ bare_label_keyword:
            | REASSIGN
            | RECHECK
            | RECURSIVE
-           | REF
+           | REF_P
            | REFERENCES
            | REFERENCING
            | REFRESH

diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index ccc927851cb9bb5d7d310d5b27e4a7c4a086571b..957ee18d8498413418fad795a56c55264492ea65 100644 (file)
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -339,7 +339,7 @@ PG_KEYWORD("real", REAL, COL_NAME_KEYWORD, BARE_LABEL)
 PG_KEYWORD("reassign", REASSIGN, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("recheck", RECHECK, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("recursive", RECURSIVE, UNRESERVED_KEYWORD, BARE_LABEL)
-PG_KEYWORD("ref", REF, UNRESERVED_KEYWORD, BARE_LABEL)
+PG_KEYWORD("ref", REF_P, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("references", REFERENCES, RESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("referencing", REFERENCING, UNRESERVED_KEYWORD, BARE_LABEL)
 PG_KEYWORD("refresh", REFRESH, UNRESERVED_KEYWORD, BARE_LABEL)