database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-13 18:28:01 +03:00
Code Activity

Add display of eventual result RowDescription (if any) to the output

Browse Source 
of Describe on a prepared statement.  This was in the original 3.0
protocol proposal, but I took it out for reasons that seemed good at
the time.  Put it back per yesterday's pghackers discussion.
This commit is contained in:
Tom Lane
2003-05-06 21:51:42 +00:00
parent 8f6a6b7e9a
commit 755d191700
7 changed files with 84 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/tcop/postgres.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.336 2003/05/06 20:26:27 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.337 2003/05/06 21:51:41 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1428,6 +1428,7 @@ static void
exec_describe_statement_message(const char *stmt_name)
{
PreparedStatement *pstmt;
TupleDesc tupdesc;
List *l;
StringInfoData buf;
@@ -1445,6 +1446,9 @@ exec_describe_statement_message(const char *stmt_name)
if (whereToSendOutput != Remote)
return; /* can't actually do anything... */
/*
* First describe the parameters...
*/
pq_beginmessage(&buf, 't'); /* parameter description message type */
pq_sendint(&buf, length(pstmt->argtype_list), 4);
@@ -1455,6 +1459,24 @@ exec_describe_statement_message(const char *stmt_name)
pq_sendint(&buf, (int) ptype, 4);
}
pq_endmessage(&buf);
/*
* Next send RowDescription or NoData to describe the result...
*/
tupdesc = FetchPreparedStatementResultDesc(pstmt);
if (tupdesc)
{
List *targetlist;
if (ChoosePortalStrategy(pstmt->query_list) == PORTAL_ONE_SELECT)
targetlist = ((Query *) lfirst(pstmt->query_list))->targetList;
else
targetlist = NIL;
SendRowDescriptionMessage(tupdesc, targetlist);
}
else
pq_putemptymessage('n'); /* NoData */
}
/*
@@ -2359,7 +2381,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.336 $ $Date: 2003/05/06 20:26:27 $\n");
puts("$Revision: 1.337 $ $Date: 2003/05/06 21:51:41 $\n");
}
/*