Skip to content

update grammar file for maintainability - #2270

Merged
MuhammadTahaNaveed merged 1 commit into
apache:masterfrom
jrgemignani:cleanup_grammar_file
Dec 11, 2025
Merged

update grammar file for maintainability#2270
MuhammadTahaNaveed merged 1 commit into
apache:masterfrom
jrgemignani:cleanup_grammar_file

Conversation

@jrgemignani

@jrgemignanijrgemignani commented Dec 10, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Consolidated duplicate code, added helper functions, and reviewed the grammar file for issues.

NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.

Improvements:

  1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
  2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
  3. Extracted WITH clause validation into validate_return_item_aliases helper
  4. Created make_default_return_node helper for subquery return-less logic

Benefits:

  • Reduced code duplication by ~150 lines
  • Improved maintainability with helper functions
  • Eliminated manual string length calculations (error-prone)

All 29 existing regression tests pass

modified: src/backend/parser/cypher_gram.y

@github-actionsgithub-actionsBot added master override-stale To keep issues/PRs untouched from stale action labels Dec 10, 2025
@jrgemignani
jrgemignaniforce-pushed the cleanup_grammar_file branch 2 times, most recently from d428791 to a90c7deCompareDecember 10, 2025 17:38
@MuhammadTahaNaveed

MuhammadTahaNaveed commented Dec 11, 2025

Copy link
Copy Markdown
Member

@jrgemignani I don't think there's a need for adding a separate test file just for these tests. These tests are already in abundance in other test files. Maybe in future we should have a separate one for grammar, but it should be a comprehensive test suite and should cover all constructs.

@jrgemignani
update grammar file for maintainability
d3cda3d
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
@jrgemignani

jrgemignani commented Dec 11, 2025

Copy link
Copy Markdown
ContributorAuthor

@jrgemignani I don't think there's a need for adding a separate test file just for these tests. These tests are already in abundance in other test files. Maybe in future we should have a separate one for grammar, but it should be a comprehensive test suite and should cover all constructs.

removed.

@MuhammadTahaNaveed
MuhammadTahaNaveed merged commit 91de779 into apache:masterDec 11, 2025
7 checks passed
jrgemignani added a commit to jrgemignani/age that referenced this pull request Dec 16, 2025
@jrgemignani
Update grammar file for maintainability (apache#2270)
f2b03d3
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
MuhammadTahaNaveed pushed a commit that referenced this pull request Dec 16, 2025
@jrgemignani@MuhammadTahaNaveed
Update grammar file for maintainability (#2270)
7432ac6
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
jrgemignani added a commit to jrgemignani/age that referenced this pull request Jan 30, 2026
@jrgemignani
Update grammar file for maintainability (apache#2270)
e0d12c1
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
@jrgemignanijrgemignani mentioned this pull request Jan 30, 2026
Merged
MuhammadTahaNaveed pushed a commit that referenced this pull request Feb 3, 2026
@jrgemignani@MuhammadTahaNaveed
Update grammar file for maintainability (#2270)
deb8692
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
jrgemignani added a commit to jrgemignani/age that referenced this pull request Mar 24, 2026
@jrgemignani
Update grammar file for maintainability (apache#2270)
62bc712
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
MuhammadTahaNaveed pushed a commit that referenced this pull request Mar 26, 2026
@jrgemignani@MuhammadTahaNaveed
Update grammar file for maintainability (#2270)
bf0d629
Consolidated duplicate code, added helper functions, and reviewed
the grammar file for issues.
NOTE: I used an AI tool to review and cleanup the grammar file. I
have reviewed all of the work it did.
Improvements:
1. Added KEYWORD_STRDUP macro to eliminate hardcoded string lengths
2. Consolidated EXPLAIN statement handling into make_explain_stmt helper
3. Extracted WITH clause validation into validate_return_item_aliases helper
4. Created make_default_return_node helper for subquery return-less logic
Benefits:
- Reduced code duplication by ~150 lines
- Improved maintainability with helper functions
- Eliminated manual string length calculations (error-prone)
All 29 existing regression tests pass
modified: src/backend/parser/cypher_gram.y
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MuhammadTahaNaveedMuhammadTahaNaveedMuhammadTahaNaveed approved these changes

Assignees

No one assigned

Labels

masteroverride-staleTo keep issues/PRs untouched from stale action

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jrgemignani@MuhammadTahaNaveed