Add "\pset linestyle ascii/unicode" option to psql, allowing our traditional

ASCII-art style of table output to be upgraded to use Unicode box drawing
characters if desired.  By default, psql will use the Unicode characters
whenever client_encoding is UTF8.

The patch forces linestyle=ascii in pg_regress usage, ensuring we don't
break the regression tests in Unicode locales.

Roger Leigh

Author: tglsfdc

doc/src/sgml/ref/psql-ref.sgml

@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.231 2009/10/08 16:34:00 alvherre Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.232 2009/10/13 21:04:01 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -1760,6 +1760,39 @@ lo_import 152801
           </listitem>
           </varlistentry>
 
+          <varlistentry>
+          <term><literal>linestyle</literal></term>
+          <listitem>
+          <para>
+          Sets the border line drawing style to one
+          of <literal>ascii</literal> or <literal>unicode</literal>.
+          Unique abbreviations are allowed.  (That would mean one
+          letter is enough.)
+          </para>
+
+          <para>
+          <quote>ASCII</quote> uses plain <acronym>ASCII</acronym> characters.
+          </para>
+
+          <para>
+          <quote>Unicode</quote> uses Unicode box-drawing characters.
+          </para>
+
+          <para>
+          When the selected output format is one that draws lines or boxes
+          around the data, this setting controls how the lines are drawn.
+          Plain <acronym>ASCII</acronym> characters work everywhere, but
+          Unicode characters look nicer on displays that recognize them.
+          </para>
+
+          <para>
+          If this option has not been set, the default behavior is to
+          use Unicode characters if the client character set encoding
+          is UTF-8, otherwise <acronym>ASCII</acronym> characters.
+          </para>
+          </listitem>
+          </varlistentry>
+
           <varlistentry>
           <term><literal>expanded</literal> (or <literal>x</literal>)</term>
           <listitem>

src/bin/psql/command.c

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.209 2009/10/07 22:14:24 alvherre Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.210 2009/10/13 21:04:01 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1788,6 +1788,26 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 			printf(_("Output format is %s.\n"), _align2string(popt->topt.format));
 	}
 
+	/* set table line style */
+	else if (strcmp(param, "linestyle") == 0)
+	{
+		if (!value)
+			;
+		else if (pg_strncasecmp("ascii", value, vallen) == 0)
+			popt->topt.line_style = &pg_asciiformat;
+		else if (pg_strncasecmp("unicode", value, vallen) == 0)
+			popt->topt.line_style = &pg_utf8format;
+		else
+		{
+			psql_error("\\pset: allowed line styles are ascii, unicode\n");
+			return false;
+		}
+
+		if (!quiet)
+			printf(_("Line style is %s.\n"),
+				   get_line_style(&popt->topt)->name);
+	}
+
 	/* set border style/width */
 	else if (strcmp(param, "border") == 0)
 	{

src/bin/psql/mbprint.c

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.35 2009/06/11 14:49:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.36 2009/10/13 21:04:01 tgl Exp $
  *
  * XXX this file does not really belong in psql/.  Perhaps move to libpq?
  * It also seems that the mbvalidate function is redundant with existing
@@ -30,8 +30,8 @@
 
 typedef unsigned int pg_wchar;
 
-static int
-get_utf8_id(void)
+int
+pg_get_utf8_id(void)
 {
 	static int	utf8_id = -1;
 
@@ -40,7 +40,7 @@ get_utf8_id(void)
 	return utf8_id;
 }
 
-#define PG_UTF8		get_utf8_id()
+#define PG_UTF8		pg_get_utf8_id()
 
 
 static pg_wchar

src/bin/psql/mbprint.h

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/bin/psql/mbprint.h,v 1.13 2009/06/11 14:49:08 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/bin/psql/mbprint.h,v 1.14 2009/10/13 21:04:01 tgl Exp $ */
 #ifndef MBPRINT_H
 #define MBPRINT_H
 
@@ -9,8 +9,8 @@ struct lineptr
 	int			width;
 };
 
+extern int	pg_get_utf8_id(void);
 extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding);
-
 extern int	pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding);
 extern void pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count);
 extern void pg_wcssize(unsigned char *pwcs, size_t len, int encoding,