Commit02eac01

committed

Make RLS related error messages more consistent and compliant.

Also updated regression expected output to match. Noted and patch by Daniele Varrazzo.

1 parent6c534fd commit02eac01Copy full SHA for 02eac01

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ CreatePolicy(CreatePolicyStmt *stmt)`
`563`	`563`	`if (HeapTupleIsValid(policy_tuple))`
`564`	`564`	`ereport(ERROR,`
`565`	`565`	`(errcode(ERRCODE_DUPLICATE_OBJECT),`
`566`		`-errmsg("policy \"%s\" forrelation \"%s\" already exists",`
	`566`	`+errmsg("policy \"%s\" fortable \"%s\" already exists",`
`567`	`567`	`stmt->policy_name,RelationGetRelationName(target_table))));`
`568`	`568`
`569`	`569`	`values[Anum_pg_policy_polrelid-1]=ObjectIdGetDatum(table_id);`
`@@ -735,7 +735,7 @@ AlterPolicy(AlterPolicyStmt *stmt)`
`735`	`735`	`if (!HeapTupleIsValid(policy_tuple))`
`736`	`736`	`ereport(ERROR,`
`737`	`737`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`738`		`-errmsg("policy \"%s\"on table \"%s\" does not exist",`
	`738`	`+errmsg("policy \"%s\"for table \"%s\" does not exist",`
`739`	`739`	`stmt->policy_name,`
`740`	`740`	`RelationGetRelationName(target_table))));`
`741`	`741`
`@@ -977,7 +977,7 @@ get_relation_policy_oid(Oid relid, const char *policy_name, bool missing_ok)`
`977`	`977`	`if (!missing_ok)`
`978`	`978`	`ereport(ERROR,`
`979`	`979`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`980`		`-errmsg("policy \"%s\" for table\"%s\" does not exist",`
	`980`	`+errmsg("policy \"%s\" for table \"%s\" does not exist",`
`981`	`981`	`policy_name,get_rel_name(relid))));`
`982`	`982`
`983`	`983`	`policy_oid=InvalidOid;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ CreateRole(CreateRoleStmt *stmt)`
`301`	`301`	`if (!superuser())`
`302`	`302`	`ereport(ERROR,`
`303`	`303`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`304`		`-errmsg("must be superuser to change bypassrls attribute.")));`
	`304`	`+errmsg("must be superuser to change bypassrls attribute")));`
`305`	`305`	`}`
`306`	`306`	`else`
`307`	`307`	`{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1988,7 +1988,7 @@ GRANT ALL ON y1, y2 TO rls_regress_user1;`
`1988`	`1988`	`CREATE POLICY p1 ON y1 FOR ALL USING (a % 2 = 0);`
`1989`	`1989`	`CREATE POLICY p2 ON y1 FOR SELECT USING (a > 2);`
`1990`	`1990`	`CREATE POLICY p1 ON y1 FOR SELECT USING (a % 2 = 1); --fail`
`1991`		`-ERROR: policy "p1" forrelation "y1" already exists`
	`1991`	`+ERROR: policy "p1" fortable "y1" already exists`
`1992`	`1992`	`CREATE POLICY p1 ON y2 FOR ALL USING (a % 2 = 0); --OK`
`1993`	`1993`	`ALTER TABLE y1 ENABLE ROW LEVEL SECURITY;`
`1994`	`1994`	`ALTER TABLE y2 ENABLE ROW LEVEL SECURITY;`

Comments

(0)