psql: Do not let invalid \getresults affect the next query

In pipeline mode, an invalid \getresults argument could previously
affect the next SQL command in the same pipeline. For example, after
reporting an error for \getresults -1, psql could treat the following
SQL command as a request to read pending pipeline results instead of
sending it to the server, making the command appear to be skipped or
causing missing results.

This happened because psql marked \getresults as a request to read
pipeline results before validating its optional argument. When
validation failed, psql reported the error without running the normal
cleanup path that clears the request.

Fix this by validating the \getresults argument before marking the
command as a request to read pipeline results. After an invalid
argument, psql now reports the error and sends the following SQL command
normally.

Backpatch to v18, where psql pipeline meta-commands were introduced.

Author: Fujii Masao <[email protected]>
Reviewed-by: Anthonin Bonnefoy <[email protected]>
Discussion: 
https://postgr.es/m/CAHGQGwGkgM2HKZeig5hobEgUCjn7MMJux4UCcN=ofozoevr...@mail.gmail.com
Backpatch-through: 18

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/d2ba580475ce5af8e5d07b922964e6206333af2c

Modified Files
--------------
src/bin/psql/command.c                      |  9 +++++----
src/test/regress/expected/psql_pipeline.out | 21 +++++++++++++++++++++
src/test/regress/sql/psql_pipeline.sql      | 11 +++++++++++
3 files changed, 37 insertions(+), 4 deletions(-)

Reply via email to