From d0a0bba3d243ab389ee4cf40116828918452da0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20=C3=85strand?= Date: Wed, 23 Jul 2025 10:23:44 +0200 Subject: [PATCH] Fix error message when deleting key providers 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. --- contrib/pg_tde/expected/default_principal_key.out | 2 +- contrib/pg_tde/expected/key_provider.out | 4 ++-- contrib/pg_tde/src/catalog/tde_keyring.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/pg_tde/expected/default_principal_key.out b/contrib/pg_tde/expected/default_principal_key.out index 72ec579b6de..21319d568ea 100644 --- a/contrib/pg_tde/expected/default_principal_key.out +++ b/contrib/pg_tde/expected/default_principal_key.out @@ -45,7 +45,7 @@ SELECT provider_id, provider_name, key_name -- fails SELECT pg_tde_delete_global_key_provider('file-provider'); -ERROR: Can't delete a provider which is currently in use +ERROR: cannot delete provider which is currently in use SELECT id, name FROM pg_tde_list_all_global_key_providers(); id | name ----+--------------- diff --git a/contrib/pg_tde/expected/key_provider.out b/contrib/pg_tde/expected/key_provider.out index 5563df5aa4d..7be4f59044f 100644 --- a/contrib/pg_tde/expected/key_provider.out +++ b/contrib/pg_tde/expected/key_provider.out @@ -91,7 +91,7 @@ SELECT id, name FROM pg_tde_list_all_global_key_providers(); -- fails SELECT pg_tde_delete_database_key_provider('file-provider'); -ERROR: Can't delete a provider which is currently in use +ERROR: cannot delete provider which is currently in use SELECT id, name FROM pg_tde_list_all_database_key_providers(); id | name ----+---------------- @@ -127,7 +127,7 @@ SELECT pg_tde_set_key_using_global_key_provider('test-db-key', 'file-keyring'); -- fails SELECT pg_tde_delete_global_key_provider('file-keyring'); -ERROR: Can't delete a provider which is currently in use +ERROR: cannot delete provider which is currently in use SELECT id, name FROM pg_tde_list_all_global_key_providers(); id | name ----+--------------- diff --git a/contrib/pg_tde/src/catalog/tde_keyring.c b/contrib/pg_tde/src/catalog/tde_keyring.c index 0f7b53164c1..4ca48988505 100644 --- a/contrib/pg_tde/src/catalog/tde_keyring.c +++ b/contrib/pg_tde/src/catalog/tde_keyring.c @@ -309,7 +309,8 @@ pg_tde_delete_key_provider_internal(PG_FUNCTION_ARGS, Oid db_oid) if (provider_used) { ereport(ERROR, - errmsg("Can't delete a provider which is currently in use")); + errcode(ERRCODE_OBJECT_IN_USE), + errmsg("cannot delete provider which is currently in use")); } delete_key_provider_info(provider_name, db_oid);