plpgsql: improve block formatting and unimplemented errors #117608
Merged
Conversation
This file contains 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
DrewKimball
requested review from
msbutler and
rharding6373
and removed request for
a team
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
DrewKimball
requested review from
mgartner and
a team
and removed request for
a team and
msbutler
|
The first commit is #117511. |
rharding6373
approved these changes
Jan 11, 2024
There was a problem hiding this comment.
Reviewable status:
complete! 1 of 0 LGTMs obtained (waiting on @mgartner)
This commit makes a few fixes to formatting for PL/pgSQL routines in preparation for nested blocks support, as well as a few misc fixes: 1. Blocks now print a semicolon after `END`. While the semicolon is optional for the root block, it is non-optional for nested blocks. 2. Block labels are now correctly displayed (previously, they were ignored). 3. An extra newline has been removed from the output of `SHOW CREATE FUNCTION` and `SHOW CREATE PROCEDURE`. 4. RAISE statements now capitalize the log level (e.g. `notice` -> `NOTICE`). Informs cockroachdb#114775 Informs cockroachdb#112136 Release note: None
This commit adds a parse-time check that the labels on a PLpgSQL block (if any) match. If the labels do not match, an expected syntax error is returned. This commit also adds an "unimplemented" error for block labels. Finally, errors that don't use formatting arguments have been moved to the bottom of the file for clarity. Informs cockroachdb#114775 Release note (bug fix): Incorrectly labeled PL/pgSQL blocks now return an expected syntax error.
DrewKimball
force-pushed
the
plpgsql-format
branch
from
cda5e81
to
b226b1a
Compare
|
TFTR! |
|
bors r+ |
|
Build succeeded: |
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.
plpgsql: misc formatting fixes
This commit makes a few fixes to formatting for PL/pgSQL routines in
preparation for nested blocks support, as well as a few misc fixes:
END. While the semicolon isoptional for the root block, it is non-optional for nested blocks.
SHOW CREATE FUNCTIONand
SHOW CREATE PROCEDURE.notice->NOTICE).Informs #114775
Informs #112136
Release note: None
plpgsql: return errors for block labels
This commit adds a parse-time check that the labels on a PLpgSQL block
(if any) match. If the labels do not match, an expected syntax error is
returned. This commit also adds an "unimplemented" error for block labels.
Finally, errors that don't use formatting arguments have been moved to the
bottom of the file for clarity.
Informs #114775
Release note (bug fix): Incorrectly labeled PL/pgSQL blocks now return
an expected syntax error.