From: Fujii Masao <fujii@postgresql.org>
Date: Thu, 27 Nov 2014 17:42:43 +0000 (+0900)
Subject: Make \watch respect the user's \pset null setting.
X-Git-Tag: REL9_5_ALPHA1~1138
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=a5eb85eb6266c99f79144201f1162e5106969575;p=postgresql.git

Make \watch respect the user's \pset null setting.

Previously \watch always ignored the user's \pset null setting.
\pset null setting should be ignored for \d and similar queries.
For those, the code can reasonably have an opinion about what
the presentation should be like, since it knows what SQL query
it's issuing. This argument surely doesn't apply to \watch,
so this commit makes \watch use the user's \pset null setting.

Back-patch to 9.3 where \watch was added.
---

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 4575e2e796a..62ea0440efa 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -2868,7 +2868,6 @@ do_watch(PQExpBuffer query_buf, long sleep)
 	 * Set up rendering options, in particular, disable the pager, because
 	 * nobody wants to be prompted while watching the output of 'watch'.
 	 */
-	myopt.nullPrint = NULL;
 	myopt.topt.pager = 0;
 
 	for (;;)