Commit914042f

committed

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

completion tag of the actual statement executed. This allows thecorrect update count to be returned for UPDATE/INSERT/DELETEstatements.Kris Jurka

1 parentec7c4c1 commit914042fCopy full SHA for 914042f

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Copyright (c) 2002-2003, PostgreSQL Global Development Group`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.25 2004/01/07 18:56:25 neilc Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.26 2004/04/22 02:58:20 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -106,7 +106,7 @@ PrepareQuery(PrepareStmt *stmt)`
`106`	`106`	`* Implements the 'EXECUTE' utility statement.`
`107`	`107`	`*/`
`108`	`108`	`void`
`109`		`-ExecuteQuery(ExecuteStmtstmt,DestReceiverdest)`
	`109`	`+ExecuteQuery(ExecuteStmtstmt,DestReceiverdest,char*completionTag)`
`110`	`110`	`{`
`111`	`111`	`PreparedStatement*entry;`
`112`	`112`	`char*query_string;`
`@@ -188,7 +188,7 @@ ExecuteQuery(ExecuteStmt stmt, DestReceiver dest)`
`188`	`188`	`*/`
`189`	`189`	`PortalStart(portal,paramLI);`
`190`	`190`
`191`		`-(void)PortalRun(portal,FETCH_ALL,dest,dest,NULL);`
	`191`	`+(void)PortalRun(portal,FETCH_ALL,dest,dest,completionTag);`
`192`	`192`
`193`	`193`	`PortalDrop(portal, false);`
`194`	`194`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.212 2004/04/19 21:21:33 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.213 2004/04/22 02:58:20 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -483,7 +483,7 @@ ProcessUtility(Node *parsetree,`
`483`	`483`	`break;`
`484`	`484`
`485`	`485`	`caseT_ExecuteStmt:`
`486`		`-ExecuteQuery((ExecuteStmt*)parsetree,dest);`
	`486`	`+ExecuteQuery((ExecuteStmt*)parsetree,dest,completionTag);`
`487`	`487`	`break;`
`488`	`488`
`489`	`489`	`caseT_DeallocateStmt:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 2002-2003, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.9 2003/11/29 22:40:59 pgsql Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.10 2004/04/22 02:58:21 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -42,7 +42,8 @@ typedef struct`
`42`	`42`
`43`	`43`	`/* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */`
`44`	`44`	`externvoidPrepareQuery(PrepareStmt*stmt);`
`45`		`-externvoidExecuteQuery(ExecuteStmtstmt,DestReceiverdest);`
	`45`	`+externvoidExecuteQuery(ExecuteStmtstmt,DestReceiverdest,`
	`46`	`+char*completionTag);`
`46`	`47`	`externvoidDeallocateQuery(DeallocateStmt*stmt);`
`47`	`48`	`externvoidExplainExecuteQuery(ExplainStmtstmt,TupOutputStatetstate);`
`48`	`49`

Comments

(0)