Add log display label for unnamed server-side portals.

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 56c9e21dd7f0a455fab3faf8bbe00cbd9e833d57..80b343f36ee213ce5c4157674c3e75e57430ec68 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -1164,7 +1164,9 @@ exec_parse_message(const char *query_string,      /* string to execute */
 
        if (log_statement == LOGSTMT_ALL)
                ereport(LOG,
-                               (errmsg("statement: PREPARE %s AS %s", stmt_name, query_string)));
+                               (errmsg("statement: PREPARE %s AS %s",
+                                               (*stmt_name != '\0') ? stmt_name : "<unnamed>",
+                                               query_string)));
 
        /*
         * Start up a transaction command so we can run parse analysis etc.
@@ -1732,7 +1734,8 @@ exec_execute_message(const char *portal_name, long max_rows)
        if (log_statement == LOGSTMT_ALL)
                /* We have the portal, so output the source query. */
                ereport(LOG,
-                               (errmsg("statement: EXECUTE %s  [PREPARE:  %s]", portal_name,
+                               (errmsg("statement: EXECUTE %s  [PREPARE:  %s]",
+                                               (*portal_name != '\0') ? portal_name : "<unnamed>",
                                                portal->sourceText ? portal->sourceText : "")));
 
        BeginCommand(portal->commandTag, dest);
@@ -1867,7 +1870,7 @@ exec_execute_message(const char *portal_name, long max_rows)
                                                (long) ((stop_t.tv_sec - start_t.tv_sec) * 1000 +
                                                          (stop_t.tv_usec - start_t.tv_usec) / 1000),
                                                (long) (stop_t.tv_usec - start_t.tv_usec) % 1000,
-                                                       portal_name,
+                                                       (*portal_name != '\0') ? portal_name : "<unnamed>",
                                                        portal->sourceText ? portal->sourceText : "")));
        }