Disable expanded mode only for \d tablename, not for all backslash

commands.  Per complaint that \df+ is clearer in expanded mode.

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 023c9258d292013a85ca56a54d66fbcd80e3f762..0420772f4c4f8339cb940aa8e03ec64f700615c7 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.394 2005/10/26 19:21:53 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.395 2005/10/27 13:34:46 momjian Exp $
 
 Typical markup:
 
@@ -1700,7 +1700,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
       <listitem>
        <para>
         Prevent <command>\x</> (expanded mode) from affecting
-        backslash-command displays (Neil)
+        the output of <command>\d tablename<\> (Neil)
        </para>
       </listitem>
 

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 2999c169ef3b1c2c1393b6b737056f80e62adbaa..1b01a97d885f98d1e2b6dd3d4135e6945e0ee65c 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.108 2005/10/15 02:49:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.109 2005/10/27 13:34:47 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -795,8 +795,6 @@ PrintQueryTuples(const PGresult *results)
 {
        printQueryOpt my_popt = pset.popt;
 
-       my_popt.topt.normal_query = true;
-
        /* write output to \g argument, if any */
        if (pset.gfname)
        {

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 889014ffeaedbb9555b4af58ebfbbe7c29c01e17..aefb6041abc8f3ec84f913d44036fd1b5c087a3e 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.128 2005/10/20 05:15:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.129 2005/10/27 13:34:47 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -703,6 +703,9 @@ describeOneTableDetails(const char *schemaname,
 
        retval = false;
 
+       /* This output looks confusing in expanded mode. */
+       myopt.expanded = false;
+
        initPQExpBuffer(&buf);
        initPQExpBuffer(&title);
        initPQExpBuffer(&tmpbuf);

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 3d2a1fa1754bffccc6e84c40bf00d732e355f8c9..65d107acc4c9c84de0768205aa563f3bb8d28095 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.78 2005/10/15 02:49:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.79 2005/10/27 13:34:47 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -1491,7 +1491,7 @@ printTable(const char *title,
         * normal (user-submitted) query, not a table we're printing for a slash
         * command.
         */
-       if (opt->expanded && opt->normal_query)
+       if (opt->expanded)
                use_expanded = true;
        else
                use_expanded = false;

diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index 5b07bfd4756f65793c8c37d6e055666740b5b01d..298763533ea4169b0a84d841e2a8b943b87f2291 100644 (file)
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.h,v 1.29 2005/10/15 02:49:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.h,v 1.30 2005/10/27 13:34:47 momjian Exp $
  */
 #ifndef PRINT_H
 #define PRINT_H
@@ -43,8 +43,6 @@ typedef struct _printTableOpt
                                                                 * decimal marker */
        char       *tableAttr;          /* attributes for HTML <table ...> */
        int                     encoding;               /* character encoding */
-       bool            normal_query;   /* are we presenting the results of a "normal"
-                                                                * query, or a slash command? */
 } printTableOpt;
 
 

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 5d027dd01813e0b8d2c12a6a00afcf89a40b7fa5..783a472aec8d0897a1827fb68cbdc2affae2acc6 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.125 2005/10/15 02:49:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.126 2005/10/27 13:34:47 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -147,7 +147,6 @@ main(int argc, char *argv[])
        pset.queryFout = stdout;
        pset.popt.topt.border = 1;
        pset.popt.topt.pager = 1;
-       pset.popt.topt.normal_query = false;
        pset.popt.default_footer = true;
 
        SetVariable(pset.vars, "VERSION", PG_VERSION_STR);