From 133c8f0d79d5158e018ca967bc35c44ff21b61ad Mon Sep 17 00:00:00 2001 From: Hunaid Sohail Date: Wed, 11 Sep 2024 12:20:02 +0500 Subject: [PATCH v32] Add psql meta command conninfo+ --- doc/src/sgml/ref/psql-ref.sgml | 26 +++++++++-- src/bin/psql/command.c | 79 +++++++++++++++++++++++++++++++--- src/bin/psql/help.c | 2 +- 3 files changed, 97 insertions(+), 10 deletions(-) diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 3fd9959ed1..3f8d72b42e 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1060,11 +1060,29 @@ INSERT INTO tbls1 VALUES ($1, $2) \parse stmt1 - \conninfo + \conninfo[+] - - Outputs information about the current database connection. - + + Outputs a string displaying information about the current + database connection. When + is appended, + more details about the connection are displayed in table + format: + + Protocol Version: The version of the PostgreSQL protocol used for + this connection. + SSL Connection: True if the current connection to the server + uses SSL, and false otherwise. + GSSAPI Authenticated: True if GSSAPI is in use, or false if + GSSAPI is not in use on this connection. + Client Encoding: The encoding used by the client for this connection. + Server Encoding: The encoding used by the server for this connection. + Session User: The session user's name; + see the session_user() function in + for more details. + Backend PID: The process ID of the backend for the + connection. + + diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 4dfc7b2d85..d6e1e83eec 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -72,7 +72,8 @@ static backslashResult exec_command_cd(PsqlScanState scan_state, bool active_bra const char *cmd); static backslashResult exec_command_close(PsqlScanState scan_state, bool active_branch, const char *cmd); -static backslashResult exec_command_conninfo(PsqlScanState scan_state, bool active_branch); +static backslashResult exec_command_conninfo(PsqlScanState scan_state, bool active_branch, + const char *cmd); static backslashResult exec_command_copy(PsqlScanState scan_state, bool active_branch); static backslashResult exec_command_copyright(PsqlScanState scan_state, bool active_branch); static backslashResult exec_command_crosstabview(PsqlScanState scan_state, bool active_branch); @@ -328,8 +329,8 @@ exec_command(const char *cmd, status = exec_command_cd(scan_state, active_branch, cmd); else if (strcmp(cmd, "close") == 0) status = exec_command_close(scan_state, active_branch, cmd); - else if (strcmp(cmd, "conninfo") == 0) - status = exec_command_conninfo(scan_state, active_branch); + else if (strcmp(cmd, "conninfo") == 0 || strcmp(cmd, "conninfo+") == 0) + status = exec_command_conninfo(scan_state, active_branch, cmd); else if (pg_strcasecmp(cmd, "copy") == 0) status = exec_command_copy(scan_state, active_branch); else if (strcmp(cmd, "copyright") == 0) @@ -739,11 +740,14 @@ exec_command_close(PsqlScanState scan_state, bool active_branch, const char *cmd } /* - * \conninfo -- display information about the current connection + * \conninfo, \conninfo+ -- display information about the current connection */ static backslashResult -exec_command_conninfo(PsqlScanState scan_state, bool active_branch) +exec_command_conninfo(PsqlScanState scan_state, bool active_branch, const char *cmd) { + bool show_verbose; + show_verbose = strchr(cmd, '+') ? true : false; + if (active_branch) { char *db = PQdb(pset.db); @@ -774,6 +778,71 @@ 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)); } + /* Print some additional information about the connection */ + if (show_verbose) + { + printQueryOpt popt = pset.popt; + printTableContent cont; + char protocol_version[10]; + char backend_pid[10]; + int cols, + rows; + int ssl_in_use, + gssapi_used; + char *client_encoding, + *server_encoding, + *session_user; + char *parameters[] = + { + "Protocol Version", + "SSL Connection", + "GSSAPI Authenticated", + "Client Encoding", + "Server Encoding", + "Session User", + "Backend PID" + }; + + /* Get values for the parameters */ + sprintf(protocol_version, "%d", PQprotocolVersion(pset.db)); + ssl_in_use = PQsslInUse(pset.db); + gssapi_used = PQconnectionUsedGSSAPI(pset.db); + client_encoding = PQparameterStatus(pset.db, "client_encoding"); + server_encoding = PQparameterStatus(pset.db, "server_encoding"); + session_user = PQparameterStatus(pset.db, "session_authorization"); + sprintf(backend_pid, "%d", PQbackendPID(pset.db)); + + /* Print the parameters and their values in a table */ + cols = 2; + rows = 7; + printTableInit(&cont, &popt.topt, _("Connection Information"), cols, rows); + + printTableAddHeader(&cont, gettext_noop("Parameter"), true, 'l'); + printTableAddHeader(&cont, gettext_noop("Value"), true, 'l'); + + /* Add the parameter and its value to the table */ + for (int i = 0; i < rows; i++) + { + printTableAddCell(&cont, parameters[i], false, false); + if (i == 0) + printTableAddCell(&cont, protocol_version, false, false); + else if (i == 1) + printTableAddCell(&cont, ssl_in_use ? _("yes") : _("no"), false, false); + else if (i == 2) + printTableAddCell(&cont, gssapi_used ? _("yes") : _("no"), false, false); + else if (i == 3) + printTableAddCell(&cont, client_encoding ? client_encoding : _("(none)"), false, false); + else if (i == 4) + printTableAddCell(&cont, server_encoding ? server_encoding : _("(none)"), false, false); + else if (i == 5) + printTableAddCell(&cont, session_user ? session_user : _("(none)"), false, false); + else if (i == 6) + printTableAddCell(&cont, backend_pid, false, false); + } + + printTable(&cont, pset.queryFout, false, pset.logfile); + printTableCleanup(&cont); + } printSSLInfo(); printGSSInfo(); } diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 19d20c5878..ce6d6ae184 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -313,7 +313,7 @@ slashUsage(unsigned short int pager) else HELP0(" \\c[onnect] {[DBNAME|- USER|- HOST|- PORT|-] | conninfo}\n" " connect to new database (currently no connection)\n"); - HELP0(" \\conninfo display information about current connection\n"); + HELP0(" \\conninfo[+] display information about current connection\n"); HELP0(" \\encoding [ENCODING] show or set client encoding\n"); HELP0(" \\parse STMT_NAME create a prepared statement\n"); HELP0(" \\password [USERNAME] securely change the password for a user\n"); -- 2.34.1