From 3d62fbc4eb59a24caaf5b0c46978f18236e0031b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 16 Apr 2000 20:04:51 +0000
Subject: [PATCH] squished \dS+ bug pointed out by Mike Mascari

---
 src/bin/psql/command.c  | 5 +----
 src/bin/psql/describe.c | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 4387c567ed..2e895a947c 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.30 2000/04/16 15:46:40 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.31 2000/04/16 20:04:50 petere Exp $
  */
 #include "postgres.h"
 #include "command.h"
@@ -306,9 +306,6 @@ exec_command(const char *cmd,
 			case 'i':
 			case 's':
 			case 'S':
-				if (cmd[1] == 'S' && cmd[2] == '\0')
-					success = listTables("Stvs", NULL, show_verbose);
-				else
 					success = listTables(&cmd[1], name, show_verbose);
 				break;
 			default:
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 9db62ce9bd..a9285b7bb4 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.20 2000/04/16 15:46:40 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.21 2000/04/16 20:04:51 petere Exp $
  */
 #include "postgres.h"
 #include "describe.h"
@@ -973,6 +973,10 @@ listTables(const char *infotype, const char *name, bool desc)
 	PGresult   *res;
 	printQueryOpt myopt = pset.popt;
 
+	if (showSystem && !(showSeq || showIndices || showViews || showTables))
+		showTables = showViews = showSeq = true;
+
+
 	buf[0] = '\0';
 
 	/* tables */