diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-29 22:10:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-03-29 22:10:34 +0000 |
| commit | d67442ccfd654f0f021ec4499804d681706dfc4e (patch) | |
| tree | ae6bdb517931870d8d721d25841f705d05e47d0d /src/backend/commands/creatinh.c | |
| parent | ea13a3fab28bad7e747eb0492036bdcb705ead33 (diff) | |
| download | postgresql-d67442ccfd654f0f021ec4499804d681706dfc4e.tar.gz postgresql-d67442ccfd654f0f021ec4499804d681706dfc4e.zip | |
Mop-up some infelicities in new relation lookup handling.
Diffstat (limited to 'src/backend/commands/creatinh.c')
| -rw-r--r-- | src/backend/commands/creatinh.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index 1cf84f17a3e..f85814cc0f4 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.93 2002/03/29 19:06:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.94 2002/03/29 22:10:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -260,13 +260,12 @@ RemoveRelation(const RangeVar *relation) void TruncateRelation(const RangeVar *relation) { - Oid relid; Relation rel; - - relid = RangeVarGetRelid(relation, false); + Oid relid; /* Grab exclusive lock in preparation for truncate */ - rel = heap_open(relid, AccessExclusiveLock); + rel = heap_openrv(relation, AccessExclusiveLock); + relid = RelationGetRelid(rel); if (rel->rd_rel->relkind == RELKIND_SEQUENCE) elog(ERROR, "TRUNCATE cannot be used on sequences. '%s' is a sequence", @@ -280,7 +279,7 @@ TruncateRelation(const RangeVar *relation) elog(ERROR, "TRUNCATE cannot be used on system tables. '%s' is a system table", RelationGetRelationName(rel)); - if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId())) + if (!pg_class_ownercheck(relid, GetUserId())) elog(ERROR, "you do not own relation \"%s\"", RelationGetRelationName(rel)); |