Tom Lane schrieb:
Andreas Wenk <a.w...@netzmeister-st-pauli.de> writes:
I am not sure when the function shobj_description(oid, name) is giving a
result.
That retrieves the comment for the object (the role, in this case).
regards, tom lane
attached you can find an updated patch. The changes are:
- change \du and \dg to \du+ and \dg+ in the docu
- change the same in psql/help.c
- change the translation files in psql/po
two questions on this:
- is it ok to provide all these changes in one patch?
- I did the patch with git format-patch and left the header in the patch. Ok?
Although Tom asked if the translation files should be patched at all, I sent
them.
vi showed the foreign language signs in the patch utf-8 encoded and not as the character.
I imported the patch in my local master. The md5checksum was the same (e.g ja.po) an the
character are in original language. Everything was ok - so if there are problems, please
keep me informed.
Cheers
Andy
>From 6a54ecafa1626631c6de78f59f72825ab554b9a3 Mon Sep 17 00:00:00 2001
From: Andreas Wenk <a.w...@netzmeister-st-pauli.de>
Date: Thu, 23 Jul 2009 11:15:05 +0200
Subject: [PATCH] In psql \du and \dg can also be used as \du+ and \dg+. This
was missing in psql help. All affected files have been changed.
---
doc/src/sgml/ref/psql-ref.sgml | 10 +++++++---
src/bin/psql/help.c | 4 ++--
src/bin/psql/po/cs.po | 8 ++++----
src/bin/psql/po/de.po | 8 ++++----
src/bin/psql/po/es.po | 8 ++++----
src/bin/psql/po/fr.po | 8 ++++----
src/bin/psql/po/ja.po | 8 ++++----
src/bin/psql/po/pt_BR.po | 8 ++++----
src/bin/psql/po/sv.po | 8 ++++----
src/bin/psql/po/tr.po | 8 ++++----
10 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index cd94af1..6de4b83 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1124,13 +1124,15 @@ testdb=>
<varlistentry>
- <term><literal>\dg [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
+ <term><literal>\dg[+] [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
<listitem>
<para>
Lists all database roles. If <replaceable
class="parameter">pattern</replaceable> is specified, only
those roles whose names match the pattern are listed.
- (This command is now effectively the same as <literal>\du</>.)
+ (This command is now effectively the same as <literal>\du</literal>).
+ If the form <literal>\dg+</literal> is used, additional information
+ is shown about each role, including the comment for each role.
</para>
</listitem>
</varlistentry>
@@ -1247,12 +1249,14 @@ testdb=>
<varlistentry>
- <term><literal>\du [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
+ <term><literal>\du[+] [ <replaceable class="parameter">pattern</replaceable> ]</literal></term>
<listitem>
<para>
Lists all database roles. If <replaceable
class="parameter">pattern</replaceable> is specified, only
those roles whose names match the pattern are listed.
+ If the form <literal>\du+</literal> is used, additional information
+ is shown about each role, including the comment for each role.
</para>
</listitem>
</varlistentry>
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 5f13b8a..74c379f 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -210,7 +210,7 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\dFd[+] [PATTERN] list text search dictionaries\n"));
fprintf(output, _(" \\dFp[+] [PATTERN] list text search parsers\n"));
fprintf(output, _(" \\dFt[+] [PATTERN] list text search templates\n"));
- fprintf(output, _(" \\dg [PATTERN] list roles (groups)\n"));
+ fprintf(output, _(" \\dg[+] [PATTERN] list roles (groups)\n"));
fprintf(output, _(" \\di[S+] [PATTERN] list indexes\n"));
fprintf(output, _(" \\dl list large objects, same as \\lo_list\n"));
fprintf(output, _(" \\dn[+] [PATTERN] list schemas\n"));
@@ -219,7 +219,7 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\ds[S+] [PATTERN] list sequences\n"));
fprintf(output, _(" \\dt[S+] [PATTERN] list tables\n"));
fprintf(output, _(" \\dT[S+] [PATTERN] list data types\n"));
- fprintf(output, _(" \\du [PATTERN] list roles (users)\n"));
+ fprintf(output, _(" \\du[+] [PATTERN] list roles (users)\n"));
fprintf(output, _(" \\dv[S+] [PATTERN] list views\n"));
fprintf(output, _(" \\l[+] list all databases\n"));
fprintf(output, _(" \\z [PATTERN] same as \\dp\n"));
diff --git a/src/bin/psql/po/cs.po b/src/bin/psql/po/cs.po
index 196bfe3..eed7ada 100644
--- a/src/bin/psql/po/cs.po
+++ b/src/bin/psql/po/cs.po
@@ -965,8 +965,8 @@ msgstr " \\dFt[+] [VZOR] seznam Å¡ablon fulltextového vyhledávánÃ\n
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [VZOR] seznam rolà (skupin)\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [VZOR] seznam rolà (skupin)\n"
#: help.c:214
#, c-format
@@ -1012,8 +1012,8 @@ msgstr " \\dT[S+] [VZOR] seznam datových typů\n"
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [VZOR] seznam rolà (uživatelů)\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [VZOR] seznam rolà (uživatelů)\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index 5f80414..e648af9 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -989,8 +989,8 @@ msgstr " \\dFt[+] [MUSTER] Textsuchevorlagen auflisten\n"
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [MUSTER] Rollen (Gruppen) auflisten\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [MUSTER] Rollen (Gruppen) auflisten\n"
#: help.c:214
#, c-format
@@ -1037,8 +1037,8 @@ msgstr " \\dT[S+] [MUSTER] Datentypen auflisten\n"
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [MUSTER] Rollen (Benutzer) auflisten\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [MUSTER] Rollen (Benutzer) auflisten\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
index 99efd85..a3800d7 100644
--- a/src/bin/psql/po/es.po
+++ b/src/bin/psql/po/es.po
@@ -972,8 +972,8 @@ msgstr " \\dFt[+] [PATR
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [PATRÓN] listar roles (grupos)\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [PATRÓN] listar roles (grupos)\n"
#: help.c:214
#, c-format
@@ -1020,8 +1020,8 @@ msgstr " \\dT[S+] [PATR
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [PATRÓN] listar roles (usuarios)\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [PATRÓN] listar roles (usuarios)\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/fr.po b/src/bin/psql/po/fr.po
index 87bc512..a6fe029 100644
--- a/src/bin/psql/po/fr.po
+++ b/src/bin/psql/po/fr.po
@@ -1033,8 +1033,8 @@ msgstr ""
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [MODÈLE] affiche la liste des groupes\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [MODÈLE] affiche la liste des groupes\n"
#: help.c:214
#, c-format
@@ -1082,8 +1082,8 @@ msgstr " \\dT[S+] [MOD
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\dp [MODÈLE] affiche la liste des rôles (utilisateurs)\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [MODÈLE] affiche la liste des rôles (utilisateurs)\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/ja.po b/src/bin/psql/po/ja.po
index 7d35b99..339c272 100644
--- a/src/bin/psql/po/ja.po
+++ b/src/bin/psql/po/ja.po
@@ -972,8 +972,8 @@ msgstr " \\dFt[+] [ãã¿ã¼ã³] ããã¹ãæ¤ç´¢ç¨ã®ãã³ãã¬ã¼ã
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [ãã¿ã¼ã³] ãã¼ã«ï¼ã°ã«ã¼ãï¼ã®ä¸è¦§ã表示\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [ãã¿ã¼ã³] ãã¼ã«ï¼ã°ã«ã¼ãï¼ã®ä¸è¦§ã表示\n"
#: help.c:214
#, c-format
@@ -1020,8 +1020,8 @@ msgstr " \\dT[S+] [ãã¿ã¼ã³] ãã¼ã¿åã®ä¸è¦§ã表示\n"
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [ãã¿ã¼ã³] ãã¼ã«ï¼ã¦ã¼ã¶ï¼ã®ä¸è¦§ã表示\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [ãã¿ã¼ã³] ãã¼ã«ï¼ã¦ã¼ã¶ï¼ã®ä¸è¦§ã表示\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/pt_BR.po b/src/bin/psql/po/pt_BR.po
index a60a7ad..6efea4f 100644
--- a/src/bin/psql/po/pt_BR.po
+++ b/src/bin/psql/po/pt_BR.po
@@ -967,8 +967,8 @@ msgstr " \\dFt[+] [MODELO] lista modelos de busca textual\n"
#: help.c:213
#, fuzzy, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [MODELO] lista roles (grupos)\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [MODELO] lista roles (grupos)\n"
#: help.c:214
#, c-format
@@ -1014,8 +1014,8 @@ msgstr " \\dT[S+] [MODELO] lista tipos de dados\n"
#: help.c:222
#, fuzzy, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [MODELO] lista roles (usuários)\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [MODELO] lista roles (usuários)\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/sv.po b/src/bin/psql/po/sv.po
index 10227f4..27b6a88 100644
--- a/src/bin/psql/po/sv.po
+++ b/src/bin/psql/po/sv.po
@@ -935,8 +935,8 @@ msgstr " \\dFt[+] [MALL] lista texts
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [MALL] lista roller (grupper)\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [MALL] lista roller (grupper)\n"
#: help.c:214
#, c-format
@@ -981,8 +981,8 @@ msgstr " \\dT[S+] [MALL] lista datatyper\n"
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [MALL] lista roller (användare)\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [MALL] lista roller (användare)\n"
#: help.c:223
#, c-format
diff --git a/src/bin/psql/po/tr.po b/src/bin/psql/po/tr.po
index f515915..06f1799 100644
--- a/src/bin/psql/po/tr.po
+++ b/src/bin/psql/po/tr.po
@@ -944,8 +944,8 @@ msgstr " \\dFt[+] [PATTERN] metin arama Åablonlarını listele\n"
#: help.c:213
#, c-format
-msgid " \\dg [PATTERN] list roles (groups)\n"
-msgstr " \\dg [PATTERN] rolleri (grupları) listele\n"
+msgid " \\dg[+] [PATTERN] list roles (groups)\n"
+msgstr " \\dg[+] [PATTERN] rolleri (grupları) listele\n"
#: help.c:214
#, c-format
@@ -989,8 +989,8 @@ msgstr " \\dT[S+] [PATTERN] veri tiplerini listele\n"
#: help.c:222
#, c-format
-msgid " \\du [PATTERN] list roles (users)\n"
-msgstr " \\du [PATTERN] rolleri (kullanıcıları) listele\n"
+msgid " \\du[+] [PATTERN] list roles (users)\n"
+msgstr " \\du[+] [PATTERN] rolleri (kullanıcıları) listele\n"
#: help.c:223
#, c-format
--
1.6.0.4
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
