diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/heap/heapam.c | 16 | ||||
| -rw-r--r-- | src/backend/catalog/dependency.c | 6 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index dcb9fc8fb64..15556fda538 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.212 2006/05/10 23:18:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.213 2006/05/28 02:27:08 alvherre Exp $ * * * INTERFACE ROUTINES @@ -794,8 +794,8 @@ relation_close(Relation relation, LOCKMODE lockmode) * heap_open - open a heap relation by relation OID * * This is essentially relation_open plus check that the relation - * is not an index or special relation. (The caller should also check - * that it's not a view before assuming it has storage.) + * is not an index nor a composite type. (The caller should also + * check that it's not a view before assuming it has storage.) * ---------------- */ Relation @@ -810,11 +810,6 @@ heap_open(Oid relationId, LOCKMODE lockmode) (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("\"%s\" is an index", RelationGetRelationName(r)))); - else if (r->rd_rel->relkind == RELKIND_SPECIAL) - ereport(ERROR, - (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is a special relation", - RelationGetRelationName(r)))); else if (r->rd_rel->relkind == RELKIND_COMPOSITE_TYPE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), @@ -845,11 +840,6 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode) (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("\"%s\" is an index", RelationGetRelationName(r)))); - else if (r->rd_rel->relkind == RELKIND_SPECIAL) - ereport(ERROR, - (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is a special relation", - RelationGetRelationName(r)))); else if (r->rd_rel->relkind == RELKIND_COMPOSITE_TYPE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 3493c6c70b9..3543ac2280b 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.53 2006/04/30 01:08:06 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.54 2006/05/28 02:27:08 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -1898,10 +1898,6 @@ getRelationDescription(StringInfo buffer, Oid relid) appendStringInfo(buffer, _("index %s"), relname); break; - case RELKIND_SPECIAL: - appendStringInfo(buffer, _("special system relation %s"), - relname); - break; case RELKIND_SEQUENCE: appendStringInfo(buffer, _("sequence %s"), relname); |