mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have psql output tab as the proper number of spaces, rather than \x09.

Browse Source
This commit is contained in:
Bruce Momjian 2008-05-08 19:11:36 +00:00
parent 5adf98ae24
commit eabd1b2ee8
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/psql/mbprint.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.31 2008/05/08 17:04:26 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.32 2008/05/08 19:11:36 momjian Exp $
* *
* XXX this file does not really belong in psql/. Perhaps move to libpq? * XXX this file does not really belong in psql/. Perhaps move to libpq?
* It also seems that the mbvalidate function is redundant with existing * It also seems that the mbvalidate function is redundant with existing
@ -321,6 +321,14 @@ pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
linewidth += 2; linewidth += 2;
ptr += 2; ptr += 2;
} }
else if (*pwcs == '\t') /* Tab */
{
do
{
*ptr++ = ' ';
linewidth++;
} while (linewidth % 8 != 0);
}
else if (w < 0) /* Other control char */ else if (w < 0) /* Other control char */
{ {
sprintf((char *) ptr, "\\x%02X", *pwcs); sprintf((char *) ptr, "\\x%02X", *pwcs);

16
src/test/regress/expected/prepare.out
View File

@ -155,15 +155,17 @@ SELECT name, statement, parameter_types FROM pg_prepared_statements
name | statement | parameter_types name | statement | parameter_types
------+-----------------------------------------------------------------+-------------------------------------------------------- ------+-----------------------------------------------------------------+--------------------------------------------------------
q2 | PREPARE q2(text) AS | {text} q2 | PREPARE q2(text) AS | {text}
: \x09SELECT datname, datistemplate, datallowconn : SELECT datname, datistemplate, datallowconn
: \x09FROM pg_database WHERE datname = $1; : FROM pg_database WHERE datname = $1;
q3 | PREPARE q3(text, int, float, boolean, oid, smallint) AS | {text,integer,"double precision",boolean,oid,smallint} q3 | PREPARE q3(text, int, float, boolean, oid, smallint) AS | {text,integer,"double precision",boolean,oid,smallint}
: \x09SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR : SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 O
: \x09ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int) ; R
: \x09ORDER BY unique1; : ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::
; int)
: ORDER BY unique1;
q5 | PREPARE q5(int, text) AS | {integer,text} q5 | PREPARE q5(int, text) AS | {integer,text}
: \x09SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2 : SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2
: \x09ORDER BY unique1; : ORDER BY unique1;
q6 | PREPARE q6 AS | {integer,name} q6 | PREPARE q6 AS | {integer,name}
: SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2; : SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2;
q7 | PREPARE q7(unknown) AS | {path} q7 | PREPARE q7(unknown) AS | {path}