squished \dS+ bug pointed out by Mike Mascari

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 4387c567ed859b9aa9044be3602991c6f77faf83..2e895a947cfeadad6d14ae2dc495cd8afdcaa8f0 100644 (file)
--- 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 9db62ce9bdb25be2be4e42a86922a29837a9cf49..a9285b7bb49e0a9108b452d88358595814f8573f 100644 (file)
--- 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 */