Commitf356ec5

committed

Teach RemoveRoleFromObjectPolicy() about partitioned tables.

Table partitioning, introduced in commitf0e4475, added a newrelkind - RELKIND_PARTITIONED_TABLE. UpdateRemoveRoleFromObjectPolicy() to handle it, otherwise DROP OWNED BYwill fail if the role has any RLS policies referring to partitionedtables.Dean Rasheed, reviewed by Amit Langote.Discussion:https://postgr.es/m/CAEZATCUnNOKN8sLML9jUzxecALWpEXK3a3W7y0PgFR4%2Buhgc%3Dg%40mail.gmail.com

1 parent0436f6b commitf356ec5Copy full SHA for f356ec5

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,8 @@ RemoveRoleFromObjectPolicy(Oid roleid, Oid classid, Oid policy_id)`
`474`	`474`
`475`	`475`	`rel=relation_open(relid,AccessExclusiveLock);`
`476`	`476`
`477`		`-if (rel->rd_rel->relkind!=RELKIND_RELATION)`
	`477`	`+if (rel->rd_rel->relkind!=RELKIND_RELATION&&`
	`478`	`+rel->rd_rel->relkind!=RELKIND_PARTITIONED_TABLE)`
`478`	`479`	`ereport(ERROR,`
`479`	`480`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`480`	`481`	`errmsg("\"%s\" is not a table",`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3885,13 +3885,17 @@ RESET SESSION AUTHORIZATION;`
`3885`	`3885`	`CREATE ROLE regress_rls_dob_role1;`
`3886`	`3886`	`CREATE ROLE regress_rls_dob_role2;`
`3887`	`3887`	`CREATE TABLE dob_t1 (c1 int);`
	`3888`	`+CREATE TABLE dob_t2 (c1 int) PARTITION BY RANGE (c1);`
`3888`	`3889`	`CREATE POLICY p1 ON dob_t1 TO regress_rls_dob_role1 USING (true);`
`3889`	`3890`	`DROP OWNED BY regress_rls_dob_role1;`
`3890`	`3891`	`DROP POLICY p1 ON dob_t1; -- should fail, already gone`
`3891`	`3892`	`ERROR: policy "p1" for table "dob_t1" does not exist`
`3892`	`3893`	`CREATE POLICY p1 ON dob_t1 TO regress_rls_dob_role1,regress_rls_dob_role2 USING (true);`
`3893`	`3894`	`DROP OWNED BY regress_rls_dob_role1;`
`3894`	`3895`	`DROP POLICY p1 ON dob_t1; -- should succeed`
	`3896`	`+CREATE POLICY p1 ON dob_t2 TO regress_rls_dob_role1,regress_rls_dob_role2 USING (true);`
	`3897`	`+DROP OWNED BY regress_rls_dob_role1;`
	`3898`	`+DROP POLICY p1 ON dob_t2; -- should succeed`
`3895`	`3899`	`DROP USER regress_rls_dob_role1;`
`3896`	`3900`	`DROP USER regress_rls_dob_role2;`
`3897`	`3901`	`--`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1740,6 +1740,7 @@ CREATE ROLE regress_rls_dob_role1;`
`1740`	`1740`	`CREATE ROLE regress_rls_dob_role2;`
`1741`	`1741`
`1742`	`1742`	`CREATETABLEdob_t1 (c1int);`
	`1743`	`+CREATETABLEdob_t2 (c1int) PARTITION BY RANGE (c1);`
`1743`	`1744`
`1744`	`1745`	`CREATE POLICY p1ON dob_t1 TO regress_rls_dob_role1 USING (true);`
`1745`	`1746`	`DROP OWNED BY regress_rls_dob_role1;`
`@@ -1749,6 +1750,10 @@ CREATE POLICY p1 ON dob_t1 TO regress_rls_dob_role1,regress_rls_dob_role2 USING`
`1749`	`1750`	`DROP OWNED BY regress_rls_dob_role1;`
`1750`	`1751`	`DROP POLICY p1ON dob_t1;-- should succeed`
`1751`	`1752`
	`1753`	`+CREATE POLICY p1ON dob_t2 TO regress_rls_dob_role1,regress_rls_dob_role2 USING (true);`
	`1754`	`+DROP OWNED BY regress_rls_dob_role1;`
	`1755`	`+DROP POLICY p1ON dob_t2;-- should succeed`
	`1756`	`+`
`1752`	`1757`	`DROPUSER regress_rls_dob_role1;`
`1753`	`1758`	`DROPUSER regress_rls_dob_role2;`
`1754`	`1759`

Comments

(0)