diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-02-18 19:49:30 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-02-18 19:49:30 +0000 |
| commit | 812a929a85805f29dfa2a13ae404a4cc821a1cb9 (patch) | |
| tree | e3f4bfdf78d0166d8028e6e390365882b9e4d51e /src | |
| parent | 33b41590dfdff917a3491ea59b6e51b0c57c47a2 (diff) | |
| download | postgresql-812a929a85805f29dfa2a13ae404a4cc821a1cb9.tar.gz postgresql-812a929a85805f29dfa2a13ae404a4cc821a1cb9.zip | |
Fix portal management code to support non-default command completion tags for
portals using PORTAL_UTIL_SELECT strategy. This is currently significant only
for FETCH queries, which are supposed to include a count in the tag. Seems
it's been broken since 7.4, but nobody noticed before Knut Lehre.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tcop/pquery.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 62310f7c0cd..269988121da 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.111 2006/10/04 00:29:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.111.2.1 2007/02/18 19:49:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -919,6 +919,8 @@ FillPortalStore(Portal portal) PortalCreateHoldStore(portal); treceiver = CreateDestReceiver(DestTuplestore, portal); + completionTag[0] = '\0'; + switch (portal->strategy) { case PORTAL_ONE_RETURNING: @@ -929,13 +931,11 @@ FillPortalStore(Portal portal) * tuplestore. Auxiliary query outputs are discarded. */ PortalRunMulti(portal, treceiver, None_Receiver, completionTag); - /* Override default completion tag with actual command result */ - portal->commandTag = pstrdup(completionTag); break; case PORTAL_UTIL_SELECT: PortalRunUtility(portal, linitial(portal->parseTrees), - treceiver, NULL); + treceiver, completionTag); break; default: @@ -944,6 +944,10 @@ FillPortalStore(Portal portal) break; } + /* Override default completion tag with actual command result */ + if (completionTag[0] != '\0') + portal->commandTag = pstrdup(completionTag); + (*treceiver->rDestroy) (treceiver); } |