Re: pgsql: pgindent: preserve blank lines around #else/#endif

On Thu, Feb 13, 2014 at 04:07:21PM -0300, Alvaro Herrera wrote:
> Alvaro Herrera wrote:
> > Bruce Momjian wrote:
> > > pgindent: preserve blank lines around #else/#endif
> > >
> > > This requires a new version of pg_bsd_indent, version 1.3, to be
> > > downloaded.
> >
> > This is a bit of a mess. I now can't use 9.3's pgindent because it
> > wants to have pg_bsd_indent 1.2 installed, but I only have 1.3 because
> > the master branch requested it.
>
> BTW did this commit, or other recent pgindent tweaks, have more
> implications than we were aware of? I just tried running HEAD's
> pgindent in 9.3 (in individual files) and among other changes I saw this
> one:
>
> diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
> index 17bbcb5..5595f47 100644
> --- a/src/backend/access/common/reloptions.c
> +++ b/src/backend/access/common/reloptions.c
> @@ -624,6 +624,7 @@ transformRelOptions(Datum oldOptions, List *defList, char *namspace,
> }
> else if (def->defnamespace == NULL)
> continue;
> +
> else if (pg_strcasecmp(def->defnamespace, namspace) != 0)
> continue;
>
> This seems an odd change to be making.

I just tested pgindent in head against that file in 9.3 and head and
didn't see that additional blank line, which is cetainly odd.

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

+ Everyone has their own god. +