Skip to content

Commit 7238703

Browse files
committed
Fix documentation of psql's ECHO all mode.
"ECHO all" is ignored for interactive input, and has been for a very long time, though possibly not for as long as the documentation has claimed the opposite. Fix that, and also note that empty lines aren't echoed, which while dubious is another longstanding behavior (it's embedded in our regression test files for one thing). Per bug #12721 from Hans Ginzel. In HEAD, also improve the code comments in this area, and suppress an unnecessary fflush(stdout) when we're not echoing. That would likely be safe to back-patch, but I'll not risk it mere hours before a release wrap.
1 parent 3553d9c commit 7238703

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ PostgreSQL documentation
5353
<term><option>--echo-all</></term>
5454
<listitem>
5555
<para>
56-
Print all input lines to standard output as they are read. This is more
57-
useful for script processing than interactive mode. This is
56+
Print all nonempty input lines to standard output as they are read.
57+
(This does not apply to lines read interactively.) This is
5858
equivalent to setting the variable <varname>ECHO</varname> to
5959
<literal>all</literal>.
6060
</para>
@@ -2438,13 +2438,13 @@ bar
24382438
<term><varname>ECHO</varname></term>
24392439
<listitem>
24402440
<para>
2441-
If set to <literal>all</literal>, all lines
2442-
entered from the keyboard or from a script are written to the standard output
2443-
before they are parsed or executed. To select this behavior on program
2441+
If set to <literal>all</literal>, all nonempty input lines are printed
2442+
to standard output as they are read. (This does not apply to lines
2443+
read interactively.) To select this behavior on program
24442444
start-up, use the switch <option>-a</option>. If set to
24452445
<literal>queries</literal>,
2446-
<application>psql</application> merely prints all queries as
2447-
they are sent to the server. The switch for this is
2446+
<application>psql</application> prints each query to standard output
2447+
as it is sent to the server. The switch for this is
24482448
<option>-e</option>.
24492449
</para>
24502450
</listitem>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy