Resolve conflicts in src/include/parser/kwlist.h#2549
Open
silent-observer wants to merge 1 commit into
Open
Conversation
Commit 06a7c31 has added a new is-bare-label argument to PG_KEYWORD. Most keywords have BARE_LABEL, allowing them to be used as labels without AS keyword, but 39 are marked AS_LABEL, requiring as. However, there are a lot of GPDB-specific keywords too, most of them without comments. Conservatively mark them AS_LABEL to avoid accidentally breaking the grammar, Also mark all GPDB-specific keywords with comments to simplify future conflict resolutions. However, some of the keywords, specifically "format" and "ignore", are present in later versions of Postgres and are marked as BARE_LABEL, so mark them BARE_LABEL here too.
RekGRpth
reviewed
May 21, 2026
RekGRpth
approved these changes
May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit 06a7c31 has added a new is-bare-label
argument to PG_KEYWORD. Most keywords have BARE_LABEL, allowing them to be used
as labels without AS keyword, but 39 are marked AS_LABEL, requiring as. However,
there are a lot of GPDB-specific keywords too, most of them without comments.
Conservatively mark them AS_LABEL to avoid accidentally breaking the grammar,
Also mark all GPDB-specific keywords with comments to simplify future conflict
resolutions. However, some of the keywords, specifically "format" and "ignore",
are present in later versions of Postgres and "format" is marked as BARE_LABEL,
so mark it BARE_LABEL here too.