diff options
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index e61384beec8..30118d5237b 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.275 2007/01/25 02:17:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.276 2007/02/20 17:32:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -986,10 +986,11 @@ DoCopy(const CopyStmt *stmt) { Query *query = stmt->query; List *rewritten; - Plan *plan; + PlannedStmt *plan; DestReceiver *dest; Assert(query); + Assert(query->commandType == CMD_SELECT); Assert(!is_from); cstate->rel = NULL; @@ -999,6 +1000,7 @@ DoCopy(const CopyStmt *stmt) (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("COPY (SELECT) WITH OIDS is not supported"))); + /* Query mustn't use INTO, either */ if (query->into) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -1016,7 +1018,6 @@ DoCopy(const CopyStmt *stmt) * shouldn't modify its input ... FIXME someday. */ query = copyObject(query); - Assert(query->commandType == CMD_SELECT); /* * Must acquire locks in case we didn't come fresh from the parser. @@ -1051,7 +1052,7 @@ DoCopy(const CopyStmt *stmt) ((DR_copy *) dest)->cstate = cstate; /* Create a QueryDesc requesting no output */ - cstate->queryDesc = CreateQueryDesc(query, plan, + cstate->queryDesc = CreateQueryDesc(plan, ActiveSnapshot, InvalidSnapshot, dest, NULL, false); |