Commit93a1fce

committed

Add permission display to \db+.

1 parenta837ed8 commit93a1fceCopy full SHA for 93a1fce

File tree

+20

-11

lines changed

+20

-11

lines changed

Lines changed: 3 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.118 2004/07/13 16:48:15 momjian Exp $`
	`2`	`+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.119 2004/07/15 03:56:04 momjian Exp $`
`3`	`3`	`PostgreSQL documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -832,6 +832,8 @@ testdb=>`
`832`	`832`	`Lists all available tablespaces. If <replaceable`
`833`	`833`	`class="parameter">pattern</replaceable>`
`834`	`834`	`is specified, only tablespaces whose names match the pattern are shown.`
	`835`	`+ If <literal>+</literal> is appended to the command name, each object`
	`836`	`+ is listed with its associated permissions.`
`835`	`837`	`</para>`
`836`	`838`	`</listitem>`
`837`	`839`	`</varlistentry>`

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-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.121 2004/07/13 16:48:16 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.122 2004/07/15 03:56:06 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -302,7 +302,7 @@ exec_command(const char *cmd,`
`302`	`302`	`success=describeAggregates(pattern,show_verbose);`
`303`	`303`	`break;`
`304`	`304`	`case'b':`
`305`		`-success=describeTablespaces(pattern);`
	`305`	`+success=describeTablespaces(pattern,show_verbose);`
`306`	`306`	`break;`
`307`	`307`	`case'c':`
`308`	`308`	`success=listConversions(pattern);`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.102 2004/07/13 16:48:16 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.103 2004/07/15 03:56:06 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"describe.h"`
`@@ -106,7 +106,7 @@ describeAggregates(const char *pattern, bool verbose)`
`106`	`106`	`* Takes an optional regexp to select particular tablespaces`
`107`	`107`	`*/`
`108`	`108`	`bool`
`109`		`-describeTablespaces(constchar*pattern)`
	`109`	`+describeTablespaces(constchar*pattern,boolverbose)`
`110`	`110`	`{`
`111`	`111`	`PQExpBufferDatabuf;`
`112`	`112`	`PGresult*res;`
`@@ -117,10 +117,17 @@ describeTablespaces(const char *pattern)`
`117`	`117`	`printfPQExpBuffer(&buf,`
`118`	`118`	`"SELECT spcname AS \"%s\",\n"`
`119`	`119`	`" pg_catalog.pg_get_userbyid(spcowner) AS \"%s\",\n"`
`120`		`-" spclocation AS \"%s\"\n"`
`121`		`-"FROM pg_catalog.pg_tablespace\n",`
	`120`	`+" spclocation AS \"%s\"",`
`122`	`121`	`_("Name"),_("Owner"),_("Location"));`
`123`	`122`
	`123`	`+if (verbose)`
	`124`	`+appendPQExpBuffer(&buf,`
	`125`	`+",\n spcacl as \"%s\"",`
	`126`	`+_("Access privileges"));`
	`127`	`+`
	`128`	`+appendPQExpBuffer(&buf,`
	`129`	`+"\nFROM pg_catalog.pg_tablespace\n");`
	`130`	`+`
`124`	`131`	`processNamePattern(&buf,pattern, false, false,`
`125`	`132`	`NULL,"spcname",NULL,`
`126`	`133`	`NULL);`

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-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.h,v 1.25 2004/07/13 16:48:16 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.h,v 1.26 2004/07/15 03:56:06 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefDESCRIBE_H`
`9`	`9`	`#defineDESCRIBE_H`
`@@ -14,7 +14,7 @@`
`14`	`14`	`booldescribeAggregates(constchar*pattern,boolverbose);`
`15`	`15`
`16`	`16`	`/* \db */`
`17`		`-booldescribeTablespaces(constchar*pattern);`
	`17`	`+booldescribeTablespaces(constchar*pattern,boolverbose);`
`18`	`18`
`19`	`19`	`/* \df */`
`20`	`20`	`booldescribeFunctions(constchar*pattern,boolverbose);`

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-2003, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.89 2004/07/13 16:48:16 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.90 2004/07/15 03:56:06 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"common.h"`
`@@ -211,7 +211,7 @@ slashUsage(unsigned short int pager)`
`211`	`211`	`fprintf(output,_(" \\d{t\|i\|s\|v\|S} [PATTERN] (add \"+\" for more detail)\n"`
`212`	`212`	`" list tables/indexes/sequences/views/system tables\n"));`
`213`	`213`	`fprintf(output,_(" \\da [PATTERN] list aggregate functions\n"));`
`214`		`-fprintf(output,_(" \\db [PATTERN] list tablespaces\n"));`
	`214`	`+fprintf(output,_(" \\db [PATTERN] list tablespaces (add \"+\" for more detail)\n"));`
`215`	`215`	`fprintf(output,_(" \\dc [PATTERN] list conversions\n"));`
`216`	`216`	`fprintf(output,_(" \\dC list casts\n"));`
`217`	`217`	`fprintf(output,_(" \\dd [PATTERN] show comment for object\n"));`

Comments

(0)