mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When using new protocol, PQexec can get out of a COPY IN or COPY OUT

Browse Source 
state by itself, so do so.
This commit is contained in:
Tom Lane 2003-06-28 00:06:01 +00:00
parent bf75f1a063
commit ea20397b79
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/interfaces/libpq/fe-exec.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.140 2003/06/23 19:20:24 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.141 2003/06/28 00:06:01 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1083,13 +1083,48 @@ PQexecStart(PGconn *conn)
*/ */
while ((result = PQgetResult(conn)) != NULL) while ((result = PQgetResult(conn)) != NULL)
{ {
if (result->resultStatus == PGRES_COPY_IN || if (result->resultStatus == PGRES_COPY_IN)
result->resultStatus == PGRES_COPY_OUT)
{ {
PQclear(result); if (PG_PROTOCOL_MAJOR(conn->pversion) >= 3)
printfPQExpBuffer(&conn->errorMessage, {
libpq_gettext("COPY state must be terminated first\n")); /* In protocol 3, we can get out of a COPY IN state */
return false; if (PQputCopyEnd(conn,
libpq_gettext("COPY terminated by new PQexec")) < 0)
{
PQclear(result);
return false;
}
/* keep waiting to swallow the copy's failure message */
}
else
{
/* In older protocols we have to punt */
PQclear(result);
printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("COPY IN state must be terminated first\n"));
return false;
}
}
else if (result->resultStatus == PGRES_COPY_OUT)
{
if (PG_PROTOCOL_MAJOR(conn->pversion) >= 3)
{
/*
* In protocol 3, we can get out of a COPY OUT state: we
* just switch back to BUSY and allow the remaining COPY
* data to be dropped on the floor.
*/
conn->asyncStatus = PGASYNC_BUSY;
/* keep waiting to swallow the copy's completion message */
}
else
{
/* In older protocols we have to punt */
PQclear(result);
printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("COPY OUT state must be terminated first\n"));
return false;
}
} }
PQclear(result); PQclear(result);
} }