diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/foreigncmds.c | 20 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 4 |
2 files changed, 13 insertions, 11 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; } diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8e4743d1101..03daa252817 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8184,7 +8184,7 @@ addFkRecurseReferencing(List **wqueue, Constraint *fkconstraint, Relation rel, if (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("foreign keys constraints are not supported on foreign tables"))); + errmsg("foreign key constraints are not supported on foreign tables"))); /* * If the referencing relation is a plain table, add the check triggers to @@ -8572,7 +8572,7 @@ CloneFkReferencing(List **wqueue, Relation parentRel, Relation partRel) if (partRel->rd_rel->relkind == RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("foreign keys constraints are not supported on foreign tables"))); + errmsg("foreign key constraints are not supported on foreign tables"))); /* * The constraint key may differ, if the columns in the partition are |