Use an appropriate errorcode when failing to unset principal key or removing a key provider #485
Conversation
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
Error messages are not supposed to be proper sentences, and according to the error style guide "cannot" is preferable over "can't". Also add an appropriate errcode.
ERRCODE_OBJECT_IN_USE seems appropriate for this as it's also used for things like replication slots and not only database objects.
AndersAstrand
changed the title
jeltz
reviewed
Jul 25, 2025
| @@ -706,6 +706,7 @@ pg_tde_delete_key(PG_FUNCTION_ARGS) | |||
| if (default_principal_key == NULL) | |||
| { | |||
| ereport(ERROR, | |||
| errcode(ERRCODE_OBJECT_IN_USE), | |||
| errmsg("cannot delete principal key"), | |||
There was a problem hiding this comment.
Should this also get "which is currently in use"?
There was a problem hiding this comment.
Seems like that is not a common PG way of writing it, so probably not. But maybe it should still be improved.
jeltz
approved these changes
Jul 25, 2025
AndersAstrand
merged commit 96e4944
into
percona:TDE_REL_17_STABLE
17 of 19 checks passed
AndersAstrand
deleted the
tde/errcode-when-failing-to-delete-key-or-provider
branch
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.
Also fix an error message that didn't follow the style guide https://www.postgresql.org/docs/17/error-style-guide.html