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.

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 51350ecb8ba25393b2d3db6c9d412e5cf7d7dc77..5371a038989a657a98668ab629368d976a74ad17 100644 (file)
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -23,6 +23,7 @@
 #include "utils/memutils.h"
 
 
+static void FillPortalStore(Portal portal);
 static uint32 RunFromStore(Portal portal, ScanDirection direction, long count,
                         DestReceiver *dest);
 static long PortalRunSelect(Portal portal, bool forward, long count,
@@ -461,16 +462,7 @@ PortalRun(Portal portal, long count,
                         * storing its results in the portal's tuplestore.
                         */
                        if (!portal->portalUtilReady)
-                       {
-                               DestReceiver *treceiver;
-
-                               PortalCreateHoldStore(portal);
-                               treceiver = CreateDestReceiver(Tuplestore, portal);
-                               PortalRunUtility(portal, lfirst(portal->parseTrees),
-                                                                treceiver, NULL);
-                               (*treceiver->rDestroy) (treceiver);
-                               portal->portalUtilReady = true;
-                       }
+                               FillPortalStore(portal);
 
                        /*
                         * Now fetch desired portion of results.
@@ -662,6 +654,35 @@ PortalRunSelect(Portal portal,
        return nprocessed;
 }
 
+/*
+ * FillPortalStore
+ *             Run the query and load result tuples into the portal's tuple store.
+ *
+ * This is used for PORTAL_UTIL_SELECT cases only.
+ */
+static void
+FillPortalStore(Portal portal)
+{
+       DestReceiver *treceiver;
+       char            completionTag[COMPLETION_TAG_BUFSIZE];
+
+       PortalCreateHoldStore(portal);
+       treceiver = CreateDestReceiver(Tuplestore, portal);
+
+       completionTag[0] = '\0';
+
+       PortalRunUtility(portal, lfirst(portal->parseTrees),
+                                        treceiver, completionTag);
+
+       /* Override default completion tag with actual command result */
+       if (completionTag[0] != '\0')
+               portal->commandTag = pstrdup(completionTag);
+
+       (*treceiver->rDestroy) (treceiver);
+
+       portal->portalUtilReady = true;
+}
+
 /*
  * RunFromStore
  *             Fetch tuples from the portal's tuple store.