From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
---|---|
To: | pgsql-committers(at)postgresql(dot)org |
Subject: | pgsql: Fix ruleutils pretty-printing to not generate trailing whitespac |
Date: | 2013-11-11 18:36:54 |
Message-ID: | E1VfwM2-0005ZH-A5@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
Fix ruleutils pretty-printing to not generate trailing whitespace.
The pretty-printing logic in ruleutils.c operates by inserting a newline
and some indentation whitespace into strings that are already valid SQL.
This naturally results in leaving some trailing whitespace before the
newline in many cases; which can be annoying when processing the output
with other tools, as complained of by Joe Abbate. We can fix that in
a pretty localized fashion by deleting any trailing whitespace before
we append a pretty-printing newline. In addition, we have to modify the
code inserted by commit 2f582f76b1945929ff07116cd4639747ce9bb8a1 so that
we also delete trailing whitespace when transposing items from temporary
buffers into the main result string, when a temporary item starts with a
newline.
This results in rather voluminous changes to the regression test results,
but it's easily verified that they are only removal of trailing whitespace.
Back-patch to 9.3, because the aforementioned commit resulted in many
more cases of trailing whitespace than had occurred in earlier branches.
Branch
------
REL9_3_STABLE
Details
-------
http://git.postgresql.org/pg/commitdiff/fbbd150a25676076b5ed0e68f77adafcf46c1f4d
Modified Files
--------------
src/backend/utils/adt/ruleutils.c | 129 ++-
src/test/regress/expected/aggregates.out | 24 +-
src/test/regress/expected/create_view.out | 96 +-
src/test/regress/expected/matview.out | 18 +-
src/test/regress/expected/polymorphism.out | 6 +-
src/test/regress/expected/rules.out | 1672 ++++++++++++++--------------
src/test/regress/expected/triggers.out | 2 +-
src/test/regress/expected/with.out | 2 +-
8 files changed, 990 insertions(+), 959 deletions(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Peter Eisentraut | 2013-11-11 19:17:08 | Re: [COMMITTERS] pgsql: Fix whitespace issues found by git diff --check, add gitattribut |
Previous Message | Tom Lane | 2013-11-11 15:43:11 | pgsql: Re-allow duplicate aliases within aliased JOINs. |