git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

This patch makes the EXECUTE command's completion tag return the

2004年4月22日 02:58:21 +0000 (02:58 +0000)

committer Bruce Momjian <bruce@momjian.us>

2004年4月22日 02:58:21 +0000 (02:58 +0000)

completion tag of the actual statement executed. This allows the
correct update count to be returned for UPDATE/INSERT/DELETE
statements.

Kris Jurka

src/backend/commands/prepare.c patch | blob | blame | history

src/backend/tcop/utility.c patch | blob | blame | history

src/include/commands/prepare.h patch | blob | blame | history

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c

index 0f95f3bfc0544fe8c9559198fa517fe0af67078b..d85d41c1ec7999b4c3a6ae7196c445db05c182b9 100644 (file)

--- a/src/backend/commands/prepare.c

+++ b/src/backend/commands/prepare.c

@@ -10,7 +10,7 @@

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.25 2004年01月07日 18:56:25 neilc Exp $

+ * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.26 2004年04月22日 02:58:20 momjian Exp $

*-------------------------------------------------------------------------

@@ -106,7 +106,7 @@ PrepareQuery(PrepareStmt *stmt)

* Implements the 'EXECUTE' utility statement.

void

-ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest)

+ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest, char *completionTag)

{

PreparedStatement *entry;

char *query_string;

@@ -188,7 +188,7 @@ ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest)

PortalStart(portal, paramLI);

- (void) PortalRun(portal, FETCH_ALL, dest, dest, NULL);

+ (void) PortalRun(portal, FETCH_ALL, dest, dest, completionTag);

PortalDrop(portal, false);

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c

index 45bf7d0f1c059bf096f3bee4bdca04485d0fcb51..98c63fd0e64a6583a20340507247229eee025d74 100644 (file)

--- a/src/backend/tcop/utility.c

+++ b/src/backend/tcop/utility.c

@@ -10,7 +10,7 @@

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.212 2004年04月19日 21:21:33 momjian Exp $

+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.213 2004年04月22日 02:58:20 momjian Exp $

*-------------------------------------------------------------------------

@@ -483,7 +483,7 @@ ProcessUtility(Node *parsetree,

break;

case T_ExecuteStmt:

- ExecuteQuery((ExecuteStmt *) parsetree, dest);

+ ExecuteQuery((ExecuteStmt *) parsetree, dest, completionTag);

break;

case T_DeallocateStmt:

diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h

index 90e17b7378a6dbf69e0e7161bc06597892ffa6bf..cb2fed06f076076e59ffe0cbfad12691aaa13c1c 100644 (file)

--- a/src/include/commands/prepare.h

+++ b/src/include/commands/prepare.h

@@ -6,7 +6,7 @@

- * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.9 2003年11月29日 22:40:59 pgsql Exp $

+ * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.10 2004年04月22日 02:58:21 momjian Exp $

*-------------------------------------------------------------------------

@@ -42,7 +42,8 @@ typedef struct

/* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */

extern void PrepareQuery(PrepareStmt *stmt);

-extern void ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest);

+extern void ExecuteQuery(ExecuteStmt *stmt, DestReceiver *dest,

+ char *completionTag);

extern void DeallocateQuery(DeallocateStmt *stmt);

extern void ExplainExecuteQuery(ExplainStmt *stmt, TupOutputState *tstate);

This is the main PostgreSQL git repository.

RSS Atom