diff options
| author | Joe Conway | 2015-07-07 02:16:53 +0000 |
|---|---|---|
| committer | Joe Conway | 2015-07-07 02:16:53 +0000 |
| commit | 02eac01f91923592f93abf8d325ab806b058f948 (patch) | |
| tree | f1887950facb0431fd688fe73768202e9f8886fb | |
| parent | 6c534fd68568452adcc9ccecb557eff74f6f0f4d (diff) | |
Make RLS related error messages more consistent and compliant.
Also updated regression expected output to match. Noted and patch by Daniele Varrazzo.
| -rw-r--r-- | src/backend/commands/policy.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/user.c | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/rowsecurity.out | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c index 6e95ba28b9..11efc9f30f 100644 --- a/src/backend/commands/policy.c +++ b/src/backend/commands/policy.c @@ -563,7 +563,7 @@ CreatePolicy(CreatePolicyStmt *stmt) if (HeapTupleIsValid(policy_tuple)) ereport(ERROR, (errcode(ERRCODE_DUPLICATE_OBJECT), - errmsg("policy \"%s\" for relation \"%s\" already exists", + errmsg("policy \"%s\" for table \"%s\" already exists", stmt->policy_name, RelationGetRelationName(target_table)))); values[Anum_pg_policy_polrelid - 1] = ObjectIdGetDatum(table_id); @@ -735,7 +735,7 @@ AlterPolicy(AlterPolicyStmt *stmt) if (!HeapTupleIsValid(policy_tuple)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("policy \"%s\" on table \"%s\" does not exist", + errmsg("policy \"%s\" for table \"%s\" does not exist", stmt->policy_name, RelationGetRelationName(target_table)))); @@ -977,7 +977,7 @@ get_relation_policy_oid(Oid relid, const char *policy_name, bool missing_ok) if (!missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("policy \"%s\" for table \"%s\" does not exist", + errmsg("policy \"%s\" for table \"%s\" does not exist", policy_name, get_rel_name(relid)))); policy_oid = InvalidOid; diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 3b381c5835..5b20994028 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -301,7 +301,7 @@ CreateRole(CreateRoleStmt *stmt) if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to change bypassrls attribute."))); + errmsg("must be superuser to change bypassrls attribute"))); } else { diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out index 7a293f30b5..4073c1beea 100644 --- a/src/test/regress/expected/rowsecurity.out +++ b/src/test/regress/expected/rowsecurity.out @@ -1988,7 +1988,7 @@ GRANT ALL ON y1, y2 TO rls_regress_user1; CREATE POLICY p1 ON y1 FOR ALL USING (a % 2 = 0); CREATE POLICY p2 ON y1 FOR SELECT USING (a > 2); CREATE POLICY p1 ON y1 FOR SELECT USING (a % 2 = 1); --fail -ERROR: policy "p1" for relation "y1" already exists +ERROR: policy "p1" for table "y1" already exists CREATE POLICY p1 ON y2 FOR ALL USING (a % 2 = 0); --OK ALTER TABLE y1 ENABLE ROW LEVEL SECURITY; ALTER TABLE y2 ENABLE ROW LEVEL SECURITY; |