aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2008-07-03 15:59:55 +0000
committerPeter Eisentraut <peter_e@gmx.net>2008-07-03 15:59:55 +0000
commitb11c1876ed743db3f024274c2c355084b1910fb6 (patch)
tree4e9b7772d1e782b99ef4767ec80da8d6a7740a70
parentc8dbbb194ada2d8d59ecfc7993e9c522aa77f8a6 (diff)
downloadpostgresql-b11c1876ed743db3f024274c2c355084b1910fb6.tar.gz
postgresql-b11c1876ed743db3f024274c2c355084b1910fb6.zip
Don't print the name of the database in psql \z.
-rw-r--r--doc/src/sgml/ref/grant.sgml4
-rw-r--r--src/bin/psql/describe.c5
-rw-r--r--src/test/regress/expected/dependency.out4
3 files changed, 6 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index 14013c50ad2..c80a33c5074 100644
--- 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
index dff3cf6cd50..b571db9fd81 100644
--- 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
index 6f62ce70108..4c6a6af3042 100644
--- 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