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

Commitcf34e37

Browse files
committed
Fix user mapping object description
We were using "user mapping for user XYZ" as description for user mappings, butthat's ambiguous because users can have mappings on multiple foreignservers; therefore change it to "for user XYZ on server UVW" instead.Object identities for user mappings are also updated in the same way, inbranches 9.3 and above.The incomplete description string was introduced together with the wholeSQL/MED infrastructure by commitcae565e of 8.4 era, so backpatch allthe way back.
1 parentbf22d27 commitcf34e37

File tree

2 files changed

+32
-22
lines changed

2 files changed

+32
-22
lines changed

‎src/backend/catalog/objectaddress.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,14 +2510,17 @@ getObjectDescription(const ObjectAddress *object)
25102510
HeapTupletup;
25112511
Oiduseid;
25122512
char*usename;
2513+
Form_pg_user_mappingumform;
2514+
ForeignServer*srv;
25132515

25142516
tup=SearchSysCache1(USERMAPPINGOID,
25152517
ObjectIdGetDatum(object->objectId));
25162518
if (!HeapTupleIsValid(tup))
25172519
elog(ERROR,"cache lookup failed for user mapping %u",
25182520
object->objectId);
2519-
2520-
useid= ((Form_pg_user_mapping)GETSTRUCT(tup))->umuser;
2521+
umform= (Form_pg_user_mapping)GETSTRUCT(tup);
2522+
useid=umform->umuser;
2523+
srv=GetForeignServer(umform->umserver);
25212524

25222525
ReleaseSysCache(tup);
25232526

@@ -2526,7 +2529,8 @@ getObjectDescription(const ObjectAddress *object)
25262529
else
25272530
usename="public";
25282531

2529-
appendStringInfo(&buffer,_("user mapping for %s"),usename);
2532+
appendStringInfo(&buffer,_("user mapping for %s on server %s"),usename,
2533+
srv->servername);
25302534
break;
25312535
}
25322536

@@ -3906,19 +3910,18 @@ getObjectIdentityParts(const ObjectAddress *object,
39063910
{
39073911
HeapTupletup;
39083912
Oiduseid;
3913+
Form_pg_user_mappingumform;
3914+
ForeignServer*srv;
39093915
constchar*usename;
39103916

3911-
/* no objname support */
3912-
if (objname)
3913-
*objname=NIL;
3914-
39153917
tup=SearchSysCache1(USERMAPPINGOID,
39163918
ObjectIdGetDatum(object->objectId));
39173919
if (!HeapTupleIsValid(tup))
39183920
elog(ERROR,"cache lookup failed for user mapping %u",
39193921
object->objectId);
3920-
3921-
useid= ((Form_pg_user_mapping)GETSTRUCT(tup))->umuser;
3922+
umform= (Form_pg_user_mapping)GETSTRUCT(tup);
3923+
useid=umform->umuser;
3924+
srv=GetForeignServer(umform->umserver);
39223925

39233926
ReleaseSysCache(tup);
39243927

@@ -3927,7 +3930,14 @@ getObjectIdentityParts(const ObjectAddress *object,
39273930
else
39283931
usename="public";
39293932

3930-
appendStringInfoString(&buffer,usename);
3933+
if (objname)
3934+
{
3935+
*objname=list_make1(pstrdup(usename));
3936+
*objargs=list_make1(pstrdup(srv->servername));
3937+
}
3938+
3939+
appendStringInfo(&buffer,"%s on server %s",usename,
3940+
srv->servername);
39313941
break;
39323942
}
39333943

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ CREATE USER MAPPING FOR current_user SERVER s1;
247247
DROP FOREIGN DATA WRAPPER foo; -- ERROR
248248
ERROR: cannot drop foreign-data wrapper foo because other objects depend on it
249249
DETAIL: server s1 depends on foreign-data wrapper foo
250-
user mapping for foreign_data_user depends on server s1
250+
user mapping for foreign_data_useron server s1depends on server s1
251251
HINT: Use DROP ... CASCADE to drop the dependent objects too.
252252
SET ROLE regress_test_role;
253253
DROP FOREIGN DATA WRAPPER foo CASCADE; -- ERROR
@@ -256,7 +256,7 @@ RESET ROLE;
256256
DROP FOREIGN DATA WRAPPER foo CASCADE;
257257
NOTICE: drop cascades to 2 other objects
258258
DETAIL: drop cascades to server s1
259-
drop cascades to user mapping for foreign_data_user
259+
drop cascades to user mapping for foreign_data_user on server s1
260260
\dew+
261261
List of foreign-data wrappers
262262
Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
@@ -526,10 +526,10 @@ CREATE USER MAPPING FOR current_user SERVER s3;
526526

527527
DROP SERVER s3; -- ERROR
528528
ERROR: cannot drop server s3 because other objects depend on it
529-
DETAIL: user mapping for foreign_data_user depends on server s3
529+
DETAIL: user mapping for foreign_data_useron server s3depends on server s3
530530
HINT: Use DROP ... CASCADE to drop the dependent objects too.
531531
DROP SERVER s3 CASCADE;
532-
NOTICE: drop cascades to user mapping for foreign_data_user
532+
NOTICE: drop cascades to user mapping for foreign_data_user on server s3
533533
\des
534534
List of foreign servers
535535
Name | Owner | Foreign-data wrapper
@@ -1183,8 +1183,8 @@ GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
11831183
CREATE USER MAPPING FOR current_user SERVER s9;
11841184
DROP SERVER s9 CASCADE;
11851185
NOTICE: drop cascades to 2 other objects
1186-
DETAIL: drop cascades to user mapping for public
1187-
drop cascades to user mapping for unprivileged_role
1186+
DETAIL: drop cascades to user mapping for public on server s9
1187+
drop cascades to user mapping for unprivileged_role on server s9
11881188
RESET ROLE;
11891189
CREATE SERVER s9 FOREIGN DATA WRAPPER foo;
11901190
GRANT USAGE ON FOREIGN SERVER s9 TO unprivileged_role;
@@ -1256,14 +1256,14 @@ DROP ROLE regress_test_role; -- ERROR
12561256
ERROR: role "regress_test_role" cannot be dropped because some objects depend on it
12571257
DETAIL: privileges for server s4
12581258
privileges for foreign-data wrapper foo
1259-
owner of user mapping for regress_test_role
1260-
owner of user mapping for regress_test_role
1259+
owner of user mapping for regress_test_role on server s6
1260+
owner of user mapping for regress_test_role on server s5
12611261
owner of server s5
12621262
owner of server t2
12631263
DROP SERVER s5 CASCADE;
1264-
NOTICE: drop cascades to user mapping for regress_test_role
1264+
NOTICE: drop cascades to user mapping for regress_test_role on server s5
12651265
DROP SERVER t1 CASCADE;
1266-
NOTICE: drop cascades to user mapping for public
1266+
NOTICE: drop cascades to user mapping for public on server t1
12671267
DROP SERVER t2;
12681268
DROP USER MAPPING FOR regress_test_role SERVER s6;
12691269
-- This test causes some order dependent cascade detail output,
@@ -1274,8 +1274,8 @@ NOTICE: drop cascades to 5 other objects
12741274
\set VERBOSITY default
12751275
DROP SERVER s8 CASCADE;
12761276
NOTICE: drop cascades to 2 other objects
1277-
DETAIL: drop cascades to user mapping for foreign_data_user
1278-
drop cascades to user mapping for public
1277+
DETAIL: drop cascades to user mapping for foreign_data_user on server s8
1278+
drop cascades to user mapping for public on server s8
12791279
DROP ROLE regress_test_indirect;
12801280
DROP ROLE regress_test_role;
12811281
DROP ROLE unprivileged_role; -- ERROR

0 commit comments

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