Commit013ed0b

committed

Add \conninfo command to psql, to show current connection info.

David Christensen. Reviewed by Steve Singer. Some further changes by me.

1 parentb25749c commit013ed0bCopy full SHA for 013ed0b

File tree

+33

-6

lines changed

+33

-6

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.245 2010/07/10 00:50:24 rhaas Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.246 2010/07/20 03:54:19 rhaas Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -780,6 +780,16 @@ testdb=>`
`780`	`780`	`</listitem>`
`781`	`781`	`</varlistentry>`
`782`	`782`
	`783`	`+ <varlistentry>`
	`784`	`+ <term><literal>\conninfo</literal></term>`
	`785`	`+ <listitem>`
	`786`	`+ <para>`
	`787`	`+ Outputs connection information about the current database`
	`788`	`+ connection.`
	`789`	`+ </para>`
	`790`	`+ </listitem>`
	`791`	`+ </varlistentry>`
	`792`	`+`
`783`	`793`	`<varlistentry>`
`784`	`794`	`<term><literal>\copy { <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column_list</replaceable> ) ] \| ( <replaceable class="parameter">query</replaceable> ) }`
`785`	`795`	`{ <literal>from</literal> \| <literal>to</literal> }`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.221 2010/07/06 19:18:59 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.222 2010/07/20 03:54:19 rhaas Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -294,6 +294,22 @@ exec_command(const char *cmd,`
`294`	`294`	`free(opt);`
`295`	`295`	`}`
`296`	`296`
	`297`	`+/* \conninfo -- display information about the current connection*/`
	`298`	`+elseif (strcmp(cmd,"conninfo")==0)`
	`299`	`+{`
	`300`	`+char*db=PQdb(pset.db);`
	`301`	`+char*host=PQhost(pset.db);`
	`302`	`+`
	`303`	`+if (!db)`
	`304`	`+printf("You are not connected.\n");`
	`305`	`+elseif (host)`
	`306`	`+printf("You are connected to database \"%s\" on host \"%s\" at port \"%s\" as user \"%s\".\n",`
	`307`	`+db,host,PQport(pset.db),PQuser(pset.db));`
	`308`	`+else`
	`309`	`+printf("You are connected to database \"%s\" via local socket as user \"%s\".\n",`
	`310`	`+db,PQuser(pset.db));`
	`311`	`+}`
	`312`	`+`
`297`	`313`	`/* \copy */`
`298`	`314`	`elseif (pg_strcasecmp(cmd,"copy")==0)`
`299`	`315`	`{`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.159 2010/05/26 19:29:22 rhaas Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.160 2010/07/20 03:54:19 rhaas Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -162,7 +162,7 @@ slashUsage(unsigned short int pager)`
`162`	`162`	`{`
`163`	`163`	`FILE*output;`
`164`	`164`
`165`		`-output=PageOutput(86,pager);`
	`165`	`+output=PageOutput(87,pager);`
`166`	`166`
`167`	`167`	`/* if you add/remove a line here, change the row count above */`
`168`	`168`
`@@ -249,6 +249,7 @@ slashUsage(unsigned short int pager)`
`249`	`249`	`PQdb(pset.db));`
`250`	`250`	`fprintf(output,_(" \\encoding [ENCODING] show or set client encoding\n"));`
`251`	`251`	`fprintf(output,_(" \\password [USERNAME] securely change the password for a user\n"));`
	`252`	`+fprintf(output,_(" \\conninfo display information about current connection\n"));`
`252`	`253`	`fprintf(output,"\n");`
`253`	`254`
`254`	`255`	`fprintf(output,_("Operating System\n"));`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.200 2010/07/06 19:19:00 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.201 2010/07/20 03:54:19 rhaas Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`/*----------------------------------------------------------------------`
`@@ -636,7 +636,7 @@ psql_completion(char *text, int start, int end)`
`636`	`636`	`};`
`637`	`637`
`638`	`638`	`staticconstchar*constbackslash_commands[]= {`
`639`		`-"\\a","\\connect","\\C","\\cd","\\copy","\\copyright",`
	`639`	`+"\\a","\\connect","\\conninfo","\\C","\\cd","\\copy","\\copyright",`
`640`	`640`	`"\\d","\\da","\\db","\\dc","\\dC","\\dd","\\dD","\\des","\\deu","\\dew","\\df",`
`641`	`641`	`"\\dF","\\dFd","\\dFp","\\dFt","\\dg","\\di","\\dl",`
`642`	`642`	`"\\dn","\\do","\\dp","\\drds","\\ds","\\dS","\\dt","\\dT","\\dv","\\du",`

Comments

(0)