diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-08-15 16:36:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-08-15 16:36:08 +0000 |
| commit | b1a5f8720987fbfda23c6bfb4a0dd683b9bdae70 (patch) | |
| tree | 9212ba16b7941ad741708dd0999beaf3e6948232 /src/backend/commands/copy.c | |
| parent | 38294db64bce9e78e6a1fc55fb6746074de59d2b (diff) | |
Tom Lane wrote:
> There's no longer a separate call to heap_storage_create in that routine
> --- the right place to make the test is now in the storage_create
> boolean parameter being passed to heap_create. A simple change, but
> it passeth patch's understanding ...
Thanks.
Attached is a patch against cvs tip as of 8:30 PM PST or so. Turned out
that even after fixing the failed hunks, there was a new spot in
bufmgr.c which needed to be fixed (related to temp relations;
RelationUpdateNumberOfBlocks). But thankfully the regression test code
caught it :-)
Joe Conway
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 2529b728230..890ef6f6768 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.162 2002/08/02 18:15:06 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.163 2002/08/15 16:36:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -398,6 +398,9 @@ DoCopy(const CopyStmt *stmt) if (rel->rd_rel->relkind == RELKIND_VIEW) elog(ERROR, "You cannot copy view %s", RelationGetRelationName(rel)); + else if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE) + elog(ERROR, "You cannot copy type relation %s", + RelationGetRelationName(rel)); else if (rel->rd_rel->relkind == RELKIND_SEQUENCE) elog(ERROR, "You cannot change sequence relation %s", RelationGetRelationName(rel)); @@ -443,6 +446,9 @@ DoCopy(const CopyStmt *stmt) if (rel->rd_rel->relkind == RELKIND_VIEW) elog(ERROR, "You cannot copy view %s", RelationGetRelationName(rel)); + else if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE) + elog(ERROR, "You cannot copy type relation %s", + RelationGetRelationName(rel)); else if (rel->rd_rel->relkind == RELKIND_SEQUENCE) elog(ERROR, "You cannot copy sequence %s", RelationGetRelationName(rel)); |