Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit839cb06

Browse files
committed
Use a consistent error message style for user mappings.
User mappings are essentially anonymous, so messages referring to "usermapping foo on server bar" are wrong, and inconsistent with other errormessages referring to user mappings. To be consistent with existing use,use "user mapping for foo on server bar" instead.I dropped the noise word "user" from the original suggestion to beconsistent with other uses.Discussion:http://postgr.es/m/56c6f8ab-b2d6-f1fa-deb0-1d18cf67f7b9@2ndQuadrant.com
1 parent9abbf47 commit839cb06

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎src/backend/commands/foreigncmds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
11551155
if (OidIsValid(umId))
11561156
ereport(ERROR,
11571157
(errcode(ERRCODE_DUPLICATE_OBJECT),
1158-
errmsg("user mapping \"%s\" already exists for server %s",
1158+
errmsg("user mappingfor\"%s\" already exists for server %s",
11591159
MappingUserName(useId),
11601160
stmt->servername)));
11611161

@@ -1247,7 +1247,7 @@ AlterUserMapping(AlterUserMappingStmt *stmt)
12471247
if (!OidIsValid(umId))
12481248
ereport(ERROR,
12491249
(errcode(ERRCODE_UNDEFINED_OBJECT),
1250-
errmsg("user mapping \"%s\" does not exist for the server",
1250+
errmsg("user mappingfor\"%s\" does not exist for the server",
12511251
MappingUserName(useId))));
12521252

12531253
user_mapping_ddl_aclcheck(useId,srv->serverid,stmt->servername);
@@ -1362,12 +1362,12 @@ RemoveUserMapping(DropUserMappingStmt *stmt)
13621362
if (!stmt->missing_ok)
13631363
ereport(ERROR,
13641364
(errcode(ERRCODE_UNDEFINED_OBJECT),
1365-
errmsg("user mapping \"%s\" does not exist for the server",
1365+
errmsg("user mappingfor\"%s\" does not exist for the server",
13661366
MappingUserName(useId))));
13671367

13681368
/* IF EXISTS specified, just note it */
13691369
ereport(NOTICE,
1370-
(errmsg("user mapping \"%s\" does not exist for the server, skipping",
1370+
(errmsg("user mappingfor\"%s\" does not exist for the server, skipping",
13711371
MappingUserName(useId))));
13721372
returnInvalidOid;
13731373
}

‎src/test/regress/expected/foreign_data.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ CREATE USER MAPPING FOR current_user SERVER s1; -- ERROR
556556
ERROR: server "s1" does not exist
557557
CREATE USER MAPPING FOR current_user SERVER s4;
558558
CREATE USER MAPPING FOR user SERVER s4; -- ERROR duplicate
559-
ERROR: user mapping "regress_foreign_data_user" already exists for server s4
559+
ERROR: user mappingfor"regress_foreign_data_user" already exists for server s4
560560
CREATE USER MAPPING FOR public SERVER s4 OPTIONS ("this mapping" 'is public');
561561
CREATE USER MAPPING FOR user SERVER s8 OPTIONS (username 'test', password 'secret'); -- ERROR
562562
ERROR: invalid option "username"
@@ -596,7 +596,7 @@ ERROR: role "regress_test_missing_role" does not exist
596596
ALTER USER MAPPING FOR user SERVER ss4 OPTIONS (gotcha 'true'); -- ERROR
597597
ERROR: server "ss4" does not exist
598598
ALTER USER MAPPING FOR public SERVER s5 OPTIONS (gotcha 'true'); -- ERROR
599-
ERROR: user mapping "public" does not exist for the server
599+
ERROR: user mappingfor"public" does not exist for the server
600600
ALTER USER MAPPING FOR current_user SERVER s8 OPTIONS (username 'test'); -- ERROR
601601
ERROR: invalid option "username"
602602
HINT: Valid options in this context are: user, password
@@ -626,13 +626,13 @@ ERROR: role "regress_test_missing_role" does not exist
626626
DROP USER MAPPING FOR user SERVER ss4;
627627
ERROR: server "ss4" does not exist
628628
DROP USER MAPPING FOR public SERVER s7; -- ERROR
629-
ERROR: user mapping "public" does not exist for the server
629+
ERROR: user mappingfor"public" does not exist for the server
630630
DROP USER MAPPING IF EXISTS FOR regress_test_missing_role SERVER s4;
631631
NOTICE: role "regress_test_missing_role" does not exist, skipping
632632
DROP USER MAPPING IF EXISTS FOR user SERVER ss4;
633633
NOTICE: server does not exist, skipping
634634
DROP USER MAPPING IF EXISTS FOR public SERVER s7;
635-
NOTICE: user mapping "public" does not exist for the server, skipping
635+
NOTICE: user mappingfor"public" does not exist for the server, skipping
636636
CREATE USER MAPPING FOR public SERVER s8;
637637
SET ROLE regress_test_role;
638638
DROP USER MAPPING FOR public SERVER s8; -- ERROR

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp