pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Tom Lane <tgl@sss.pgh.pa.us>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: psql: include intra-query "--" comments in what's sent to the se
Date: Wed, 01 Dec 2021 17:24:58 +0000
Message-ID: <E1msTLm-0007Ci-QQ@gemulon.postgresql.org> (raw)

psql: include intra-query "--" comments in what's sent to the server.

psql's lexer has historically deleted dash-dash (single-line) comments
from what's collected and sent to the server.  This is inconsistent
with what it does for slash-star comments, and people have complained
before that they wish such comments would be captured in the server log.
Undoing the decision completely seems like too big a behavioral change,
however.  In particular, comments on lines preceding the start of a
query are generally not thought of as being part of that query.

What we can do to improve the situation is to capture comments that
are clearly *within* a query, that is after the first non-whitespace,
non-comment token but before the query's ending semicolon or backslash
command.  This is a nearly trivial code change, and it affects only a
few regression test results.

(It is tempting to try to apply the same rule to slash-star comments.
But it's hard to see how to do that without getting strange history
behavior for comments that cross lines, especially if the user then
starts a new query on the same line as the star-slash.  In view of
the lack of complaints, let's leave that case alone.)

Discussion: https://postgr.es/m/CAJcOf-cAdMVr7azeYR7nWKsNp7qhORzc84rV6d7m7knG5Hrtsw@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/83884682f4df96184549b91869a1cf79dafb4f94

Modified Files
--------------
contrib/pg_stat_statements/expected/pg_stat_statements.out | 2 +-
src/fe_utils/psqlscan.l                                    | 9 ++++-----
src/test/regress/expected/aggregates.out                   | 4 ++--
src/test/regress/expected/generated.out                    | 4 ++--
src/test/regress/expected/with.out                         | 4 ++--
5 files changed, 11 insertions(+), 12 deletions(-)



Message-ID: <E1msTLm-0007Ci-QQ@gemulon.postgresql.org>
Permalink:  ../E1msTLm-0007Ci-QQ@gemulon.postgresql.org/
Also on:    postgresql.org/message-id/E1msTLm-0007Ci-QQ@gemulon.postgresql.org

 · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients from your mail client; the link fills in
  the headers below: reply via email
  Some clients, webmail especially, drop In-Reply-To and References from
  a link, and the reply then starts a new thread: use the mbox below.

  To: pgsql-committers@postgresql.org
  Cc: tgl@sss.pgh.pa.us
  Subject: Re: pgsql: psql: include intra-query "--" comments in what's sent to the se
  In-Reply-To: <E1msTLm-0007Ci-QQ@gemulon.postgresql.org>
  References: <E1msTLm-0007Ci-QQ@gemulon.postgresql.org>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox