Resolve conflicts in src/backend/parser/gram.y#2581
Open
RekGRpth wants to merge 3 commits into
Open
Conversation
1) Commit 06a7c31 in the file src/backend/parser/gram.y replaced var_name type_function_name param_name with BareColLabel, while the earlier commit 9b88bed had already added ColLabelNoAs in the same place. 2) Commit 06a7c31 in the file src/backend/parser/gram.y added a new definition of bare_label_keyword, while the earlier commit 6b0e52b already added the definition of keywords_ok_in_alias_no_as in the same place. 3) Commit 28a61fc in the file src/backend/parser/gram.y replaced the comment in the UNBOUNDED definition and removed GENERATED NULL_P from the IDENT definition, while the earlier commit 6b0e52b had already added many GPDB-specific definitions below in the same place. 4) Commit 844c05a in the file src/backend/parser/gram.y replaced the initialization of the concurrent field with the conditional setting of the REINDEXOPT_CONCURRENTLY option, while the early commit 19cd1cf already began to generate an error about the non-support of this functionality in the GPDB. 5) Commit 06a7c31 in the file src/backend/parser/gram.y replaced a_expr IDENT with a_expr BareColLabel, while the earlier commit 6b0e52b had already added a large comment before this place.
silent-observer
approved these changes
May 25, 2026
bimboterminator1
approved these changes
May 27, 2026
silent-observer
approved these changes
May 28, 2026
bimboterminator1
approved these changes
May 28, 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
3 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 in the file src/backend/parser/gram.y replaced
var_name type_function_name param_name with BareColLabel, while the
earlier commit 9b88bed had already added ColLabelNoAs in the same
place.
Commit 06a7c31 in the file src/backend/parser/gram.y added a new
definition of bare_label_keyword, while the earlier commit 6b0e52b
already added the definition of keywords_ok_in_alias_no_as in the same
place.
Commit 28a61fc in the file src/backend/parser/gram.y replaced the
comment in the UNBOUNDED definition and removed GENERATED NULL_P from
the IDENT definition, while the earlier commit 6b0e52b had already
added many GPDB-specific definitions below in the same place.
Commit 844c05a in the file src/backend/parser/gram.y replaced the
initialization of the concurrent field with the conditional setting of
the REINDEXOPT_CONCURRENTLY option, while the early commit 19cd1cf
already began to generate an error about the non-support of this
functionality in the GPDB.
Commit 06a7c31 in the file src/backend/parser/gram.y replaced a_expr
IDENT with a_expr BareColLabel, while the earlier commit 6b0e52b had
already added a large comment before this place.
Remove GPDB-specific ColLabelNoAs and keywords_ok_in_alias_no_as.