Don't print the name of the database in psql \z.

petere · petere · commit b11c1876ed74 · 2008-07-03T15:59:55.000Z
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.69 2008/05/28 00:45:40 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.70 2008/07/03 15:59:55 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -419,7 +419,7 @@ GRANT <replaceable class="PARAMETER">role</replaceable> [, ...] TO <replaceable
     to obtain information about existing privileges, for example:
 <programlisting>
 =&gt; \z mytable
-   Access privileges for database "lusitania"
+                Access privileges
  Schema |  Name   | Type  |  Access privileges   
 --------+---------+-------+----------------------
  public | mytable | table | miriam=arwdxt/miriam
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.174 2008/07/03 03:37:17 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.175 2008/07/03 15:59:55 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -544,8 +544,7 @@ permissionsList(const char *pattern)
 	}
 
 	myopt.nullPrint = NULL;
-	printfPQExpBuffer(&buf, _("Access privileges for database \"%s\""),
-					  PQdb(pset.db));
+	printfPQExpBuffer(&buf, _("Access privileges"));
 	myopt.title = buf.data;
 	myopt.trans_headers = true;
 	myopt.trans_columns = trans_columns;
diff --git a/src/test/regress/expected/dependency.out b/src/test/regress/expected/dependency.out
@@ -68,7 +68,7 @@ NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "deptest_pkey" fo
 GRANT ALL ON deptest1 TO regression_user2;
 RESET SESSION AUTHORIZATION;
 \z deptest1
-                Access privileges for database "regression"
+                             Access privileges
  Schema |   Name   | Type  |               Access privileges                
 --------+----------+-------+------------------------------------------------
  public | deptest1 | table | regression_user0=arwdxt/regression_user0
@@ -79,7 +79,7 @@ RESET SESSION AUTHORIZATION;
 DROP OWNED BY regression_user1;
 -- all grants revoked
 \z deptest1
-             Access privileges for database "regression"
+                          Access privileges
  Schema |   Name   | Type  |            Access privileges             
 --------+----------+-------+------------------------------------------
  public | deptest1 | table | regression_user0=arwdxt/regression_user0

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.174 2008/07/03 03:37:17 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.175 2008/07/03 15:59:55 petere Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include "postgres_fe.h"`
`14`	`14`
`@@ -544,8 +544,7 @@ permissionsList(const char *pattern)`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`myopt.nullPrint = NULL;`
`547`		`- printfPQExpBuffer(&buf, _("Access privileges for database \"%s\""),`
`548`		`- PQdb(pset.db));`
	`547`	`+ printfPQExpBuffer(&buf, _("Access privileges"));`
`549`	`548`	`myopt.title = buf.data;`
`550`	`549`	`myopt.trans_headers = true;`
`551`	`550`	`myopt.trans_columns = trans_columns;`