*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.74 1999/02/13 23:22:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.75 1999/03/14 16:42:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
parseInput(PGconn *conn)
{
char id;
+ static int pendingT = 0;
/*
* Loop to parse successive complete messages available in the buffer.
PGRES_COMMAND_OK);
if (pqGets(conn->result->cmdStatus, CMDSTATUS_LEN, conn))
return;
- conn->asyncStatus = PGASYNC_READY;
+ if (pendingT) {
+ /* Check the returned message */
+ /* if it's a SELECT in a pendingT case, */
+ /* then it probably means no rows returned. */
+ /* We clear pendingT in that case. */
+ if (strncmp(conn->result->cmdStatus, "SELECT", 6) == 0)
+ pendingT = 0;
+ }
+ if (!pendingT) conn->asyncStatus = PGASYNC_READY;
break;
case 'E': /* error return */
if (pqGets(conn->errorMessage, ERROR_MSG_LENGTH, conn))
/* and build an error result holding the error message */
conn->result = PQmakeEmptyPGresult(conn,
PGRES_FATAL_ERROR);
- conn->asyncStatus = PGASYNC_READY;
+ if (!pendingT) conn->asyncStatus = PGASYNC_READY;
break;
case 'Z': /* backend is ready for new query */
conn->asyncStatus = PGASYNC_IDLE;
+ pendingT = 0;
break;
case 'I': /* empty query */
/* read and throw away the closing '\0' */
if (conn->result == NULL)
conn->result = PQmakeEmptyPGresult(conn,
PGRES_EMPTY_QUERY);
- conn->asyncStatus = PGASYNC_READY;
+ if (!pendingT) conn->asyncStatus = PGASYNC_READY;
break;
case 'K': /* secret key data from the backend */
break;
case 'T': /* row descriptions (start of query
* results) */
+ if (pendingT) {
+ DONOTICE(conn, "Got second 'T' message!\n");
+ }
if (conn->result == NULL)
{
/* First 'T' in a query sequence */
if (getRowDescriptions(conn))
return;
+ pendingT = 1;
}
else
{
* We stop parsing until the application accepts
* the current result.
*/
+ pendingT = 0;
conn->asyncStatus = PGASYNC_READY;
return;
}
break;
case 'D': /* ASCII data tuple */
+ pendingT = 0;
if (conn->result != NULL)
{
/* Read another tuple of a normal query response */
}
break;
case 'B': /* Binary data tuple */
+ pendingT = 0;
if (conn->result != NULL)
{
/* Read another tuple of a normal query response */
}
break;
case 'G': /* Start Copy In */
+ pendingT = 0;
conn->asyncStatus = PGASYNC_COPY_IN;
break;
case 'H': /* Start Copy Out */
+ pendingT = 0;
conn->asyncStatus = PGASYNC_COPY_OUT;
break;
default:
+ pendingT = 0;
sprintf(conn->errorMessage,
"unknown protocol character '%c' read from backend. "
"(The protocol character is the first character the "