This makes all the \dX commands (most importantly to most: \df) work

like \dt does, in that it requires a \dXS to see system items.

Greg Sabino Mullane

1 files changed, 32 insertions, 27 deletions

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 08f559f96e8..4fa73d195d2 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.133 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.134 2009/01/06 21:10:30 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -194,32 +194,37 @@ slashUsage(unsigned short int pager)
 	fprintf(output, "\n");
 
 	fprintf(output, _("Informational\n"));
-	fprintf(output, _("  \\d [NAME]      describe table, index, sequence, or view\n"));
-	fprintf(output, _("  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
-	"                 list tables/indexes/sequences/views/system tables\n"));
-	fprintf(output, _("  \\da [PATTERN]  list aggregate functions\n"));
-	fprintf(output, _("  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dc [PATTERN]  list conversions\n"));
-	fprintf(output, _("  \\dC [PATTERN]  list casts\n"));
-	fprintf(output, _("  \\dd [PATTERN]  show comment for object\n"));
-	fprintf(output, _("  \\dD [PATTERN]  list domains\n"));
-	fprintf(output, _("  \\des [PATTERN] list foreign servers (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\deu [PATTERN] list user mappings (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dew [PATTERN] list foreign-data wrappers (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dF [PATTERN]  list text search configurations (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dFd [PATTERN] list text search dictionaries (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dFt [PATTERN] list text search templates\n"));
-	fprintf(output, _("  \\dFp [PATTERN] list text search parsers (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\dg [PATTERN]  list roles (groups)\n"));
-	fprintf(output, _("  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\do [NAME]     list operators\n"));
-	fprintf(output, _("  \\dl            list large objects, same as \\lo_list\n"));
-	fprintf(output, _("  \\dp [PATTERN]  list table, view, and sequence access privileges\n"));
-	fprintf(output, _("  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\du [PATTERN]  list roles (users)\n"));
-	fprintf(output, _("  \\l             list all databases (add \"+\" for more detail)\n"));
-	fprintf(output, _("  \\z [PATTERN]   list table, view, and sequence access privileges (same as \\dp)\n"));
+ 	fprintf(output, _("  Modifiers: S = show system objects  + = Additional detail\n"));
+ 	fprintf(output, _("  \\l[+]             list all databases\n"));
+ 	fprintf(output, _("  \\d[S]             list tables, views, and sequences\n"));
+ 	fprintf(output, _("  \\d[S] NAME        describe table, view, sequence, or index\n"));
+ 	fprintf(output, _("  \\dt[S+] [PATTERN] list tables\n"));
+ 	fprintf(output, _("  \\dv[S+] [PATTERN] list views\n"));
+ 	fprintf(output, _("  \\ds[S+] [PATTERN] list sequences\n"));
+ 	fprintf(output, _("  \\di[S+] [PATTERN] list indexes\n"));
+ 	fprintf(output, _("  \\df[S+] [PATTERN] list functions\n"));
+ 	fprintf(output, _("  \\dT[S+] [PATTERN] list data types\n"));
+ 	fprintf(output, _("  \\dd[S] [PATTERN]  list comments on objects\n"));
+ 	fprintf(output, _("  \\dD[S] [PATTERN]  list domains\n"));
+	fprintf(output, _("  \\des[+] [PATTERN] list foreign servers\n"));
+	fprintf(output, _("  \\deu[+] [PATTERN] list user mappings\n"));
+	fprintf(output, _("  \\dew[+] [PATTERN] list foreign-data wrappers\n"));
+ 	fprintf(output, _("  \\do[S] [PATTERN]  list operators\n"));
+ 	fprintf(output, _("  \\da[S] [PATTERN]  list aggregate functions\n"));
+ 	fprintf(output, _("  \\dc[S] [PATTERN]  list conversions\n"));
+ 	fprintf(output, _("  \\db[+] [PATTERN]  list tablespaces\n"));
+ 	fprintf(output, _("  \\dn[+] [PATTERN]  list schemas\n"));
+	fprintf(output, _("  \\dC               list casts\n"));
+	fprintf(output, _("  \\dd [PATTERN]     show comment for object\n"));
+	fprintf(output, _("  \\dF[+] [PATTERN]  list text search configurations\n"));
+	fprintf(output, _("  \\dFd[+] [PATTERN] list text search dictionaries\n"));
+	fprintf(output, _("  \\dFt [PATTERN]    list text search templates\n"));
+	fprintf(output, _("  \\dFp[+] [PATTERN] list text search parsers\n"));
+	fprintf(output, _("  \\dg [PATTERN]     list roles (groups)\n"));
+	fprintf(output, _("  \\dl               list large objects, same as \\lo_list\n"));
+	fprintf(output, _("  \\du [PATTERN]     list roles (users)\n"));
+	fprintf(output, _("  \\dp [PATTERN]     list table, view, and sequence access privileges\n"));
+	fprintf(output, _("  \\z [PATTERN]      same as \\dp\n"));
 	fprintf(output, "\n");
 
 	fprintf(output, _("Formatting\n"));