Preserve routine statement boundaries across SQL body forms - #2726
Merged
manticore-projects merged 2 commits intoSep 27, 2026
Merged
Conversation
Signed-off-by: minleejae <mmj9808@gmail.com>
Signed-off-by: minleejae <mmj9808@gmail.com>
Contributor
|
Good one! Thank you very much for working on this! |
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
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.
PostgreSQL SQL
RETURNfunctions and MySQL routines with a single SQL body could absorb the next statement into their raw declaration. Compound bodies could also stop at an innerCASE ... ENDor procedural terminator.Extract routine boundary tracking from
captureFunctionBodyso simple bodies end at their own semicolon and nested blocks remain intact. Preserve the existing token-list API and quoted-body handling. Regression tests cover utility and direct parser calls, following-statement preservation, PostgreSQL SQL bodies, MySQL control flow/labels/handlers, and existing Oracle-style declarations.Validation: complete Gradle
checkpassed (8,992 tests, 0 failures), plus 87 original/toString/deparser executions on PostgreSQL 18.6, MySQL 9.7.2 and MySQL 26.7.0 with matching results and statement boundaries.Performance smoke checks used the existing JMH SQL corpus and configured scripts with two forks and GC allocation profiling. Timing samples were noisy; existing-corpus allocation remained approximately 7.77 MB/op on the final refactor and at the base. An opaque MySQL body containing 5,000 nested IF blocks retained its following SELECT and completed without pathological growth.
Routine boundary transitions are separated into header, statement-boundary, block and control-flow helpers. The exact PMD NPathComplexity rule reported by Codacy (threshold 200) now passes without suppressions; the original violation was reproduced independently.