aboutsummaryrefslogtreecommitdiff
path: root/contrib/postgres_fdw
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2022-07-20 09:50:57 +0900
committerMichael Paquier <michael@paquier.xyz>2022-07-20 09:50:57 +0900
commit535f1fc9da728f5c692c96d5a4d635b43eeef7b7 (patch)
tree0ac8bde47ea2de934e85c110c0172780ad4bccd6 /contrib/postgres_fdw
parenta2944d8724522c5659c024b191f2fbfa9770faaf (diff)
downloadpostgresql-535f1fc9da728f5c692c96d5a4d635b43eeef7b7.tar.gz
postgresql-535f1fc9da728f5c692c96d5a4d635b43eeef7b7.zip
Tweak detail and hint messages to be consistent with project policy
Detail and hint messages should be full sentences and should end with a period, but some of the messages newly-introduced in v15 did not follow that. Author: Justin Pryzby Reviewed-by: Álvaro Herrera Discussion: https://postgr.es/m/20220719120948.GF12702@telsasoft.com Backpatch-through: 15
Diffstat (limited to 'contrib/postgres_fdw')
-rw-r--r--contrib/postgres_fdw/expected/postgres_fdw.out6
-rw-r--r--contrib/postgres_fdw/option.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 88cf4c0df6f..ccbc94a1c93 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -9564,7 +9564,7 @@ HINT: Target server's authentication method must be changed or password_require
-- Unpriv user cannot make the mapping passwordless
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD password_required 'false');
ERROR: password_required=false is superuser-only
-HINT: User mappings with the password_required option set to false may only be created or modified by the superuser
+HINT: User mappings with the password_required option set to false may only be created or modified by the superuser.
SELECT 1 FROM ft1_nopw LIMIT 1;
ERROR: password is required
DETAIL: Non-superuser cannot connect if the server does not request a password.
@@ -9585,10 +9585,10 @@ SELECT 1 FROM ft1_nopw LIMIT 1;
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (SET password_required 'true');
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD sslcert 'foo.crt');
ERROR: sslcert and sslkey are superuser-only
-HINT: User mappings with the sslcert or sslkey options set may only be created or modified by the superuser
+HINT: User mappings with the sslcert or sslkey options set may only be created or modified by the superuser.
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback_nopw OPTIONS (ADD sslkey 'foo.key');
ERROR: sslcert and sslkey are superuser-only
-HINT: User mappings with the sslcert or sslkey options set may only be created or modified by the superuser
+HINT: User mappings with the sslcert or sslkey options set may only be created or modified by the superuser.
-- We're done with the role named after a specific user and need to check the
-- changes to the public mapping.
DROP USER MAPPING FOR CURRENT_USER SERVER loopback_nopw;
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 572591a558d..707013263d0 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -195,7 +195,7 @@ postgres_fdw_validator(PG_FUNCTION_ARGS)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("password_required=false is superuser-only"),
- errhint("User mappings with the password_required option set to false may only be created or modified by the superuser")));
+ errhint("User mappings with the password_required option set to false may only be created or modified by the superuser.")));
}
else if (strcmp(def->defname, "sslcert") == 0 ||
strcmp(def->defname, "sslkey") == 0)
@@ -205,7 +205,7 @@ postgres_fdw_validator(PG_FUNCTION_ARGS)
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("sslcert and sslkey are superuser-only"),
- errhint("User mappings with the sslcert or sslkey options set may only be created or modified by the superuser")));
+ errhint("User mappings with the sslcert or sslkey options set may only be created or modified by the superuser.")));
}
}