diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-01 00:15:26 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-08-01 00:15:26 +0000 |
| commit | c4cf7fb8146d89293c6667d1fcc295c45da52713 (patch) | |
| tree | 80526e9728d4a325b79e7d6a76551204605673fa /src/backend/commands/trigger.c | |
| parent | a063d4b3ec5d74dad4cf65cdd1dd90e88c968d44 (diff) | |
| download | postgresql-c4cf7fb8146d89293c6667d1fcc295c45da52713.tar.gz postgresql-c4cf7fb8146d89293c6667d1fcc295c45da52713.zip | |
Adjust 'permission denied' messages to be more useful and consistent.
Diffstat (limited to 'src/backend/commands/trigger.c')
| -rw-r--r-- | src/backend/commands/trigger.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 9cfa852aa83..6e5b38804ff 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.152 2003/07/28 00:09:14 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.153 2003/08/01 00:15:19 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -146,7 +146,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) if (!allowSystemTableMods && IsSystemRelation(rel)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("\"%s\" is a system catalog", + errmsg("permission denied: \"%s\" is a system catalog", RelationGetRelationName(rel)))); /* permission checks */ @@ -158,13 +158,15 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(), ACL_REFERENCES); if (aclresult != ACLCHECK_OK) - aclcheck_error(aclresult, RelationGetRelationName(rel)); + aclcheck_error(aclresult, ACL_KIND_CLASS, + RelationGetRelationName(rel)); if (constrrelid != InvalidOid) { aclresult = pg_class_aclcheck(constrrelid, GetUserId(), ACL_REFERENCES); if (aclresult != ACLCHECK_OK) - aclcheck_error(aclresult, get_rel_name(constrrelid)); + aclcheck_error(aclresult, ACL_KIND_CLASS, + get_rel_name(constrrelid)); } } else @@ -173,7 +175,8 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(), ACL_TRIGGER); if (aclresult != ACLCHECK_OK) - aclcheck_error(aclresult, RelationGetRelationName(rel)); + aclcheck_error(aclresult, ACL_KIND_CLASS, + RelationGetRelationName(rel)); } /* @@ -481,7 +484,8 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior) trigname, get_rel_name(relid)))); if (!pg_class_ownercheck(relid, GetUserId())) - aclcheck_error(ACLCHECK_NOT_OWNER, get_rel_name(relid)); + aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, + get_rel_name(relid)); object.classId = RelationGetRelid(tgrel); object.objectId = HeapTupleGetOid(tup); @@ -544,7 +548,7 @@ RemoveTriggerById(Oid trigOid) if (!allowSystemTableMods && IsSystemRelation(rel)) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("\"%s\" is a system catalog", + errmsg("permission denied: \"%s\" is a system catalog", RelationGetRelationName(rel)))); /* |