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

libpq: Make target_session_attrs=read-write consume empty result.

Browse Source 
Otherwise, the leftover empty result can cause problems in some
situations.

Michael Paquier and Ashutosh Bapat, per a report from Higuchi Daisuke
This commit is contained in:
Robert Haas 2017-02-15 11:03:30 -05:00
parent fbe7a3fa45
commit 1de0a4e00e
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/interfaces/libpq/fe-connect.c
View File

@ -1896,6 +1896,7 @@ PQconnectPoll(PGconn *conn)
case CONNECTION_SSL_STARTUP:
case CONNECTION_NEEDED:
case CONNECTION_CHECK_WRITABLE:
case CONNECTION_CONSUME:
break;
default:
@ -2935,6 +2936,34 @@ keep_going: /* We will come back to here until there is
conn->status = CONNECTION_OK;
return PGRES_POLLING_OK;
case CONNECTION_CONSUME:
{
conn->status = CONNECTION_OK;
if (!PQconsumeInput(conn))
goto error_return;
if (PQisBusy(conn))
{
conn->status = CONNECTION_CONSUME;
restoreErrorMessage(conn, &savedMessage);
return PGRES_POLLING_READING;
}
/*
* Call PQgetResult() again to consume NULL result.
*/
res = PQgetResult(conn);
if (res != NULL)
{
PQclear(res);
conn->status = CONNECTION_CONSUME;
goto keep_going;
}
/* We are open for business! */
conn->status = CONNECTION_OK;
return PGRES_POLLING_OK;
}
case CONNECTION_CHECK_WRITABLE:
{
if (!saveErrorMessage(conn, &savedMessage))
@ -2994,9 +3023,12 @@ keep_going: /* We will come back to here until there is
/* We can release the address lists now. */
release_all_addrinfo(conn);
/* We are open for business! */
conn->status = CONNECTION_OK;
return PGRES_POLLING_OK;
/*
* Finish reading any remaining messages before
* being considered as ready.
*/
conn->status = CONNECTION_CONSUME;
goto keep_going;
}
/*

4
src/interfaces/libpq/libpq-fe.h
View File

@ -63,8 +63,10 @@ typedef enum
CONNECTION_SETENV, /* Negotiating environment. */
CONNECTION_SSL_STARTUP, /* Negotiating SSL. */
CONNECTION_NEEDED, /* Internal state: connect() needed */
CONNECTION_CHECK_WRITABLE /* Check if we could make a writable
CONNECTION_CHECK_WRITABLE, /* Check if we could make a writable
* connection. */
CONNECTION_CONSUME /* Wait for any pending message and
* consume them. */
} ConnStatusType;
typedef enum