diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/pg_shdepend.c | 5 | ||||
| -rw-r--r-- | src/test/regress/expected/foreign_data.out | 14 | ||||
| -rw-r--r-- | src/test/regress/sql/foreign_data.sql | 7 |
3 files changed, 18 insertions, 8 deletions
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 60145ce80d1..fd9651fce27 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -40,6 +40,7 @@ #include "catalog/pg_ts_config.h" #include "catalog/pg_ts_dict.h" #include "catalog/pg_type.h" +#include "catalog/pg_user_mapping.h" #include "commands/dbcommands.h" #include "commands/collationcmds.h" #include "commands/conversioncmds.h" @@ -1389,6 +1390,10 @@ shdepReassignOwned(List *roleids, Oid newrole) */ break; + case UserMappingRelationId: + /* ditto */ + break; + case OperatorClassRelationId: AlterOpClassOwner_oid(sdepForm->objid, newrole); break; diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 4de9764a243..5b112a2265d 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -1070,6 +1070,14 @@ ERROR: foreign table "no_table" does not exist DROP FOREIGN TABLE IF EXISTS no_table; NOTICE: foreign table "no_table" does not exist, skipping DROP FOREIGN TABLE foreign_schema.foreign_table_1; +-- REASSIGN OWNED/DROP OWNED of foreign objects +REASSIGN OWNED BY regress_test_role TO regress_test_role2; +DROP OWNED BY regress_test_role2; +ERROR: cannot drop desired object(s) because other objects depend on them +DETAIL: user mapping for regress_test_role on server s5 depends on server s5 +HINT: Use DROP ... CASCADE to drop the dependent objects too. +DROP OWNED BY regress_test_role2 CASCADE; +NOTICE: drop cascades to user mapping for regress_test_role on server s5 -- Cleanup DROP SCHEMA foreign_schema CASCADE; DROP ROLE regress_test_role; -- ERROR @@ -1077,14 +1085,8 @@ ERROR: role "regress_test_role" cannot be dropped because some objects depend o DETAIL: privileges for server s4 privileges for foreign-data wrapper foo owner of user mapping for regress_test_role on server s6 -owner of user mapping for regress_test_role on server s5 -owner of server s5 -owner of server t2 -DROP SERVER s5 CASCADE; -NOTICE: drop cascades to user mapping for regress_test_role on server s5 DROP SERVER t1 CASCADE; NOTICE: drop cascades to user mapping for public on server t1 -DROP SERVER t2; DROP USER MAPPING FOR regress_test_role SERVER s6; -- This test causes some order dependent cascade detail output, -- so switch to terse mode for it. diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql index a76ef4f0a89..7969aa107a3 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -436,12 +436,15 @@ DROP FOREIGN TABLE no_table; -- ERROR DROP FOREIGN TABLE IF EXISTS no_table; DROP FOREIGN TABLE foreign_schema.foreign_table_1; +-- REASSIGN OWNED/DROP OWNED of foreign objects +REASSIGN OWNED BY regress_test_role TO regress_test_role2; +DROP OWNED BY regress_test_role2; +DROP OWNED BY regress_test_role2 CASCADE; + -- Cleanup DROP SCHEMA foreign_schema CASCADE; DROP ROLE regress_test_role; -- ERROR -DROP SERVER s5 CASCADE; DROP SERVER t1 CASCADE; -DROP SERVER t2; DROP USER MAPPING FOR regress_test_role SERVER s6; -- This test causes some order dependent cascade detail output, -- so switch to terse mode for it. |