diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2019-05-08 13:16:54 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2019-05-08 13:20:16 -0400 |
| commit | 61639816b870347677e6e6945604e0d9da1837ca (patch) | |
| tree | 79ccf3c4630dbaec9c471f3933526a0d4d5267df /src/backend/commands/foreigncmds.c | |
| parent | df631ebc737e9d9cdf8d0691969d404f1bd584a4 (diff) | |
| download | postgresql-61639816b870347677e6e6945604e0d9da1837ca.tar.gz postgresql-61639816b870347677e6e6945604e0d9da1837ca.zip | |
Fix error messages
Some messages related to foreign servers were reporting the server name
without quotes, or not at all; our style is to have all names be quoted,
and the server name already appears quoted in a few other messages, so
just add quotes and make them all consistent.
Remove an extra "s" in other messages (typos introduced by myself in
f56f8f8da6af).
Diffstat (limited to 'src/backend/commands/foreigncmds.c')
| -rw-r--r-- | src/backend/commands/foreigncmds.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 413ce3fcb66..d7bc6e35f02 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -1184,7 +1184,7 @@ CreateUserMapping(CreateUserMappingStmt *stmt) { ereport(NOTICE, (errcode(ERRCODE_DUPLICATE_OBJECT), - errmsg("user mapping for \"%s\" already exists for server %s, skipping", + errmsg("user mapping for \"%s\" already exists for server \"%s\", skipping", MappingUserName(useId), stmt->servername))); @@ -1194,7 +1194,7 @@ CreateUserMapping(CreateUserMappingStmt *stmt) else ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), - errmsg("user mapping for \"%s\" already exists for server %s", + errmsg("user mapping for \"%s\" already exists for server \"%s\"", MappingUserName(useId), stmt->servername))); } @@ -1294,8 +1294,8 @@ AlterUserMapping(AlterUserMappingStmt *stmt) if (!OidIsValid(umId)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("user mapping for \"%s\" does not exist for the server", - MappingUserName(useId)))); + errmsg("user mapping for \"%s\" does not exist for server \"%s\"", + MappingUserName(useId), stmt->servername))); user_mapping_ddl_aclcheck(useId, srv->serverid, stmt->servername); @@ -1396,7 +1396,9 @@ RemoveUserMapping(DropUserMappingStmt *stmt) errmsg("server \"%s\" does not exist", stmt->servername))); /* IF EXISTS, just note it */ - ereport(NOTICE, (errmsg("server does not exist, skipping"))); + ereport(NOTICE, + (errmsg("server \"%s\" does not exist, skipping", + stmt->servername))); return InvalidOid; } @@ -1409,13 +1411,13 @@ RemoveUserMapping(DropUserMappingStmt *stmt) if (!stmt->missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("user mapping for \"%s\" does not exist for the server", - MappingUserName(useId)))); + errmsg("user mapping for \"%s\" does not exist for server \"%s\"", + MappingUserName(useId), stmt->servername))); /* IF EXISTS specified, just note it */ ereport(NOTICE, - (errmsg("user mapping for \"%s\" does not exist for the server, skipping", - MappingUserName(useId)))); + (errmsg("user mapping for \"%s\" does not exist for server \"%s\", skipping", + MappingUserName(useId), stmt->servername))); return InvalidOid; } |