From ed5d8196c0cc769f9e893a59d184ca7efa1fe20a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 3 Aug 2018 12:20:47 -0400
Subject: [PATCH] Remove no-longer-appropriate special case in psql's \conninfo
code.
\conninfo prints the results of PQhost() and some other libpq functions.
It used to override the PQhost() result with the hostaddr parameter if
that'd been given, but that's unhelpful when multiple hosts were listed
in the connection string. Furthermore, it seems unnecessary in the wake
of commit 1944cdc98, since PQhost does any useful substitution itself.
So let's just remove the extra code and print PQhost()'s result without
any editorialization.
Back-patch to v10, as 1944cdc98 (just) was.
Discussion: https://postgr.es/m/23287.1533227021@sss.pgh.pa.us
---
src/bin/psql/command.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index d4274887484..a30a5f8ea0a 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -596,25 +596,7 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
printf(_("You are currently not connected to a database.\n"));
else
{
- char *host;
- PQconninfoOption *connOptions;
- PQconninfoOption *option;
-
- host = PQhost(pset.db);
- /* A usable "hostaddr" overrides the basic sense of host. */
- connOptions = PQconninfo(pset.db);
- if (connOptions == NULL)
- {
- psql_error("out of memory\n");
- exit(EXIT_FAILURE);
- }
- for (option = connOptions; option && option->keyword; option++)
- if (strcmp(option->keyword, "hostaddr") == 0)
- {
- if (option->val != NULL && option->val[0] != '\0')
- host = option->val;
- break;
- }
+ char *host = PQhost(pset.db);
/* If the host is an absolute path, the connection is via socket */
if (is_absolute_path(host))
@@ -624,8 +606,6 @@ exec_command_conninfo(PsqlScanState scan_state, bool active_branch)
printf(_("You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"),
db, PQuser(pset.db), host, PQport(pset.db));
printSSLInfo();
-
- PQconninfoFree(connOptions);
}
}
--
GitLab