NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf1f2b27

committed

Fix portal management code to support non-default command completion tags for

portals using PORTAL_UTIL_SELECT strategy. This is currently significant onlyfor FETCH queries, which are supposed to include a count in the tag. Seemsit's been broken since 7.4, but nobody noticed before Knut Lehre.

1 parentaa728d5 commitf1f2b27Copy full SHA for f1f2b27

File tree

1 file changed

-4

lines changed

src/backend/tcop
- pquery.c

1 file changed

-4

lines changed

`‎src/backend/tcop/pquery.c`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.112 2007/01/05 22:19:39 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.113 2007/02/1819:49:25 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -919,6 +919,8 @@ FillPortalStore(Portal portal)`
`919`	`919`	`PortalCreateHoldStore(portal);`
`920`	`920`	`treceiver=CreateDestReceiver(DestTuplestore,portal);`
`921`	`921`
	`922`	`+completionTag[0]='\0';`
	`923`	`+`
`922`	`924`	`switch (portal->strategy)`
`923`	`925`	`{`
`924`	`926`	`casePORTAL_ONE_RETURNING:`
`@@ -929,13 +931,11 @@ FillPortalStore(Portal portal)`
`929`	`931`	`* tuplestore. Auxiliary query outputs are discarded.`
`930`	`932`	`*/`
`931`	`933`	`PortalRunMulti(portal,treceiver,None_Receiver,completionTag);`
`932`		`-/* Override default completion tag with actual command result */`
`933`		`-portal->commandTag=pstrdup(completionTag);`
`934`	`934`	`break;`
`935`	`935`
`936`	`936`	`casePORTAL_UTIL_SELECT:`
`937`	`937`	`PortalRunUtility(portal,linitial(portal->parseTrees),`
`938`		`-treceiver,NULL);`
	`938`	`+treceiver,completionTag);`
`939`	`939`	`break;`
`940`	`940`
`941`	`941`	`default:`
`@@ -944,6 +944,10 @@ FillPortalStore(Portal portal)`
`944`	`944`	`break;`
`945`	`945`	`}`
`946`	`946`
	`947`	`+/* Override default completion tag with actual command result */`
	`948`	`+if (completionTag[0]!='\0')`
	`949`	`+portal->commandTag=pstrdup(completionTag);`
	`950`	`+`
`947`	`951`	`(*treceiver->rDestroy) (treceiver);`
`948`	`952`	`}`
`949`	`953`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf1f2b27

File tree

1 file changed

1 file changed

`‎src/backend/tcop/pquery.c`

0 commit comments