Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c8e0867

Browse files
peterepetere
committed
Remove whitespace from end of lines
pgindent and perltidy should clean up the rest.
1 parent 131b4d6 commit c8e0867

24 files changed

+76
-77
lines changed

‎contrib/pg_upgrade/TESTING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Here are the steps needed to create a regression database dump file:
1313
This database can be created by running 'gmake installcheck' from
1414
src/test/regression.
1515

16-
2) Use pg_dump to dump out the regression database. Use the new
17-
cluster's pg_dump on the old database to minimize whitespace
16+
2) Use pg_dump to dump out the regression database. Use the new
17+
cluster's pg_dump on the old database to minimize whitespace
1818
differences in the diff.
1919

2020
3) Adjust the regression database dump file

‎doc/src/sgml/client-auth.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ hostnossl <replaceable>database</replaceable> <replaceable>user</replaceable>
188188
obsolete but still accepted spelling of <literal>samerole</>.)
189189
Superusers are not considered to be members of a role for the
190190
purposes of <literal>samerole</> unless they are explicitly
191-
members of the role, directly or indirectly, and not just by
191+
members of the role, directly or indirectly, and not just by
192192
virtue of being a superuser.
193193
The value <literal>replication</> specifies that the record
194194
matches if a replication connection is requested (note that

‎doc/src/sgml/func.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9648,8 +9648,8 @@ table2-mapping
96489648
<literal>array_to_json(anyarray [, pretty_bool])</literal>
96499649
</entry>
96509650
<entry>
9651-
Returns the array as JSON. A Postgres multi-dimensional array
9652-
becomes a JSON array of arrays. Line feeds will be added between
9651+
Returns the array as JSON. A Postgres multi-dimensional array
9652+
becomes a JSON array of arrays. Line feeds will be added between
96539653
dimension 1 elements if pretty_bool is true.
96549654
</entry>
96559655
<entry><literal>array_to_json('{{1,5},{99,100}}'::int[])</literal></entry>
@@ -9663,7 +9663,7 @@ table2-mapping
96639663
<literal>row_to_json(record [, pretty_bool])</literal>
96649664
</entry>
96659665
<entry>
9666-
Returns the row as JSON. Line feeds will be added between level
9666+
Returns the row as JSON. Line feeds will be added between level
96679667
1 elements if pretty_bool is true.
96689668
</entry>
96699669
<entry><literal>row_to_json(row(1,'foo'))</literal></entry>
@@ -13812,7 +13812,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
1381213812
<row>
1381313813
<entry><literal><function>pg_get_viewdef(<parameter>view_name</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
1381413814
<entry><type>text</type></entry>
13815-
<entry>get underlying <command>SELECT</command> command for view,
13815+
<entry>get underlying <command>SELECT</command> command for view,
1381613816
lines with fields are wrapped to 80 columns if pretty_bool is true (<emphasis>deprecated</emphasis>)</entry>
1381713817
</row>
1381813818
<row>
@@ -13823,13 +13823,13 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
1382313823
<row>
1382413824
<entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
1382513825
<entry><type>text</type></entry>
13826-
<entry>get underlying <command>SELECT</command> command for view,
13826+
<entry>get underlying <command>SELECT</command> command for view,
1382713827
lines with fields are wrapped to 80 columns if pretty_bool is true</entry>
1382813828
</row>
1382913829
<row>
1383013830
<entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>wrap_int</>)</function></literal></entry>
1383113831
<entry><type>text</type></entry>
13832-
<entry>get underlying <command>SELECT</command> command for view,
13832+
<entry>get underlying <command>SELECT</command> command for view,
1383313833
wrapping lines with fields as specified, pretty printing is implied</entry>
1383413834
</row>
1383513835
<row>

‎doc/src/sgml/installation.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@ PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
16221622
On some systems with shared libraries
16231623
you need to tell the system how to find the newly installed
16241624
shared libraries. The systems on which this is
1625-
<emphasis>not</emphasis> necessary include
1625+
<emphasis>not</emphasis> necessary include
16261626
<systemitem class="osname">FreeBSD</>,
16271627
<systemitem class="osname">HP-UX</>, <systemitem
16281628
class="osname">IRIX</>, <systemitem class="osname">Linux</>,

‎doc/src/sgml/pgupgrade.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ gmake prefix=/usr/local/pgsql.new install
270270

271271
<para>
272272
Install any custom shared object files (or DLLs) used by the old cluster
273-
into the new cluster, e.g. <filename>pgcrypto.so</filename>,
273+
into the new cluster, e.g. <filename>pgcrypto.so</filename>,
274274
whether they are from <filename>contrib</filename>
275275
or some other source. Do not install the schema definitions, e.g.
276276
<filename>pgcrypto.sql</>, because these will be upgraded from the old cluster.

‎doc/src/sgml/ref/pg_dump.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,11 @@ PostgreSQL documentation
403403
Dump only the object definitions (schema), not data.
404404
</para>
405405
<para>
406-
To exclude table data for only a subset of tables in the database,
406+
To exclude table data for only a subset of tables in the database,
407407
see <option>--exclude-table-data</>.
408408
</para>
409409
<para>
410-
This option is equivalent to specifying
410+
This option is equivalent to specifying
411411
<option>--section=pre-data --section=post-data</>.
412412
</para>
413413
</listitem>
@@ -417,13 +417,13 @@ PostgreSQL documentation
417417
<term><option>--section=<replaceable class="parameter">sectionname</replaceable></option></term>
418418
<listitem>
419419
<para>
420-
Only dump the named section. The name can be one of <option>pre-data</>, <option>data</>
421-
and <option>post-data</>.
420+
Only dump the named section. The name can be one of <option>pre-data</>, <option>data</>
421+
and <option>post-data</>.
422422
This option can be specified more than once. The default is to dump all sections.
423423
</para>
424424
<para>
425-
Post-data items consist of definitions of indexes, triggers, rules
426-
and constraints other than validated check constraints.
425+
Post-data items consist of definitions of indexes, triggers, rules
426+
and constraints other than validated check constraints.
427427
Pre-data items consist of all other data definition items.
428428
</para>
429429
</listitem>
@@ -640,7 +640,7 @@ PostgreSQL documentation
640640
Do not dump data for any tables matching the <replaceable
641641
class="parameter">table</replaceable> pattern. The pattern is
642642
interpreted according to the same rules as for <option>-t</>.
643-
<option>--exclude-table-data</> can be given more than once to
643+
<option>--exclude-table-data</> can be given more than once to
644644
exclude tables matching any of several patterns. This option is
645645
useful when you need the definition of a particular table even
646646
though you do not need the data in it.

‎doc/src/sgml/ref/pg_restore.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
uses the word <quote>schema</> in a different meaning.)
364364
</para>
365365
<para>
366-
This option is equivalent to specifying
366+
This option is equivalent to specifying
367367
<option>--section=pre-data --section=post-data</>.
368368
</para>
369369
</listitem>
@@ -515,13 +515,13 @@
515515
<term><option>--section=<replaceable class="parameter">sectionname</replaceable></option></term>
516516
<listitem>
517517
<para>
518-
Only restore the named section. The name can be one of <option>pre-data</>, <option>data</>
519-
and <option>post-data</>.
518+
Only restore the named section. The name can be one of <option>pre-data</>, <option>data</>
519+
and <option>post-data</>.
520520
This option can be specified more than once. The default is to restore all sections.
521521
</para>
522522
<para>
523-
Post-data items consist of definitions of indexes, triggers, rules
524-
and constraints other than validated check constraints.
523+
Post-data items consist of definitions of indexes, triggers, rules
524+
and constraints other than validated check constraints.
525525
Pre-data items consist of all other data definition items.
526526
</para>
527527
</listitem>

‎doc/src/sgml/release.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ non-ASCII characters find using grep -P '[\x80-\xFF]'
2929
does not support it
3030
http://www.pemberley.com/janeinfo/latin1.html#latexta
3131

32-
do not use numeric _UTF_ numeric character escapes (&#nnn;),
32+
do not use numeric _UTF_ numeric character escapes (&#nnn;),
3333
we can only use Latin1
3434

3535
Example: Alvaro Herrera is &Aacute;lvaro Herrera

‎src/backend/utils/misc/guc-file.l

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ ParseConfigFile(const char *config_file, const char *calling_file, bool strict,
431431
return false;
432432
}
433433

434-
ereport(LOG,
435-
(errmsg("skipping missing configuration file \"%s\"",
434+
ereport(LOG,
435+
(errmsg("skipping missing configuration file \"%s\"",
436436
config_file)));
437437
return OK;
438438
}

‎src/interfaces/libpq/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ backend_src = $(top_srcdir)/src/backend
8585
# compile with appropriate options to build a shared lib, we can't
8686
# necessarily use the same object files as the backend uses. Instead,
8787
# symlink the source files in here and build our own object file.
88-
# For some libpgport modules, this only happens if configure decides
88+
# For some libpgport modules, this only happens if configure decides
8989
# the module is needed (see filter hack in OBJS, above).
9090

9191
chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c pgsleep.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c: % : $(top_srcdir)/src/port/%
@@ -141,7 +141,7 @@ clean distclean: clean-lib
141141
rm -f pg_config_paths.h
142142
rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c
143143
rm -f chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c win32setlocale.c
144-
rm -f pgsleep.c
144+
rm -f pgsleep.c
145145
rm -f md5.c ip.c
146146
rm -f encnames.c wchar.c
147147

‎src/pl/plperl/expected/plperl_array.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_row_elements(rowfoo) RETURNS TEXT AS $$
131131
}
132132
else {
133133
$result = $row_ref->{bar};
134-
die "not an array reference".ref ($row_ref->{baz})
134+
die "not an array reference".ref ($row_ref->{baz})
135135
unless (is_array_ref($row_ref->{baz}));
136136
# process a single-dimensional array
137137
foreach my $elem (@{$row_ref->{baz}}) {
@@ -159,7 +159,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_array_of_rows(rowbar) RETURNS TEXT AS $$
159159
foreach my $row_ref (@{$row_array_ref}) {
160160
if (ref $row_ref eq 'HASH') {
161161
$result += $row_ref->{bar};
162-
die "not an array reference".ref ($row_ref->{baz})
162+
die "not an array reference".ref ($row_ref->{baz})
163163
unless (is_array_ref($row_ref->{baz}));
164164
foreach my $elem (@{$row_ref->{baz}}) {
165165
$result += $elem unless ref $elem;
@@ -177,7 +177,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_array_of_rows(rowbar) RETURNS TEXT AS $$
177177
}
178178
return $result;
179179
$$ LANGUAGE plperl;
180-
select plperl_sum_array_of_rows(ROW(ARRAY[ROW(1, ARRAY[2,3,4,5,6,7,8,9,10])::rowfoo,
180+
select plperl_sum_array_of_rows(ROW(ARRAY[ROW(1, ARRAY[2,3,4,5,6,7,8,9,10])::rowfoo,
181181
ROW(11, ARRAY[12,13,14,15,16,17,18,19,20])::rowfoo])::rowbar);
182182
plperl_sum_array_of_rows
183183
--------------------------

‎src/pl/plperl/sql/plperl_array.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_row_elements(rowfoo) RETURNS TEXT AS $$
9090
}
9191
else {
9292
$result = $row_ref->{bar};
93-
die "not an array reference".ref ($row_ref->{baz})
93+
die "not an array reference".ref ($row_ref->{baz})
9494
unless (is_array_ref($row_ref->{baz}));
9595
# process a single-dimensional array
9696
foreach my $elem (@{$row_ref->{baz}}) {
@@ -116,7 +116,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_array_of_rows(rowbar) RETURNS TEXT AS $$
116116
foreach my $row_ref (@{$row_array_ref}) {
117117
if (ref $row_ref eq 'HASH') {
118118
$result += $row_ref->{bar};
119-
die "not an array reference".ref ($row_ref->{baz})
119+
die "not an array reference".ref ($row_ref->{baz})
120120
unless (is_array_ref($row_ref->{baz}));
121121
foreach my $elem (@{$row_ref->{baz}}) {
122122
$result += $elem unless ref $elem;
@@ -135,7 +135,7 @@ CREATE OR REPLACE FUNCTION plperl_sum_array_of_rows(rowbar) RETURNS TEXT AS $$
135135
return $result;
136136
$$ LANGUAGE plperl;
137137

138-
select plperl_sum_array_of_rows(ROW(ARRAY[ROW(1, ARRAY[2,3,4,5,6,7,8,9,10])::rowfoo,
138+
select plperl_sum_array_of_rows(ROW(ARRAY[ROW(1, ARRAY[2,3,4,5,6,7,8,9,10])::rowfoo,
139139
ROW(11, ARRAY[12,13,14,15,16,17,18,19,20])::rowfoo])::rowbar);
140140

141141
-- check arrays as out parameters

‎src/test/regress/expected/alter_table.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ DROP TABLE tmp2;
384384
-- NOT VALID with plan invalidation -- ensure we don't use a constraint for
385385
-- exclusion until validated
386386
set constraint_exclusion TO 'partition';
387-
create table nv_parent (d date);
387+
create table nv_parent (d date);
388388
create table nv_child_2010 () inherits (nv_parent);
389389
create table nv_child_2011 () inherits (nv_parent);
390390
alter table nv_child_2010 add check (d between '2010-01-01'::date and '2010-12-31'::date) not valid;
@@ -1968,7 +1968,7 @@ create view alter1.v1 as select * from alter1.t1;
19681968
create function alter1.plus1(int) returns int as 'select $1+1' language sql;
19691969
create domain alter1.posint integer check (value > 0);
19701970
create type alter1.ctype as (f1 int, f2 text);
1971-
create function alter1.same(alter1.ctype, alter1.ctype) returns boolean language sql
1971+
create function alter1.same(alter1.ctype, alter1.ctype) returns boolean language sql
19721972
as 'select $1.f1 is not distinct from $2.f1 and $1.f2 is not distinct from $2.f2';
19731973
create operator alter1.=(procedure = alter1.same, leftarg = alter1.ctype, rightarg = alter1.ctype);
19741974
create operator class alter1.ctype_hash_ops default for type alter1.ctype using hash as

‎src/test/regress/expected/create_function_3.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CREATE SCHEMA temp_func_test;
88
GRANT ALL ON SCHEMA temp_func_test TO public;
99
SET search_path TO temp_func_test, public;
1010
--
11-
-- ARGUMENT and RETURN TYPES
11+
-- ARGUMENT and RETURN TYPES
1212
--
1313
CREATE FUNCTION functest_A_1(text, date) RETURNS bool LANGUAGE 'sql'
1414
AS 'SELECT $1 = ''abcd'' AND $2 > ''2001-01-01''';

‎src/test/regress/expected/foreign_data.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ NOTICE: drop cascades to user mapping for public
11831183
DROP SERVER t2;
11841184
DROP USER MAPPING FOR regress_test_role SERVER s6;
11851185
-- This test causes some order dependent cascade detail output,
1186-
-- so switch to terse mode for it.
1186+
-- so switch to terse mode for it.
11871187
\set VERBOSITY terse
11881188
DROP FOREIGN DATA WRAPPER foo CASCADE;
11891189
NOTICE: drop cascades to 5 other objects

‎src/test/regress/expected/json.out

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ SELECT array_to_json(array_agg(q),true) from (select x as b, x * 2 as c from gen
279279
(1 row)
280280

281281
SELECT array_to_json(array_agg(q),false)
282-
FROM ( SELECT $$a$$ || x AS b, y AS c,
282+
FROM ( SELECT $$a$$ || x AS b, y AS c,
283283
ARRAY[ROW(x.*,ARRAY[1,2,3]),
284-
ROW(y.*,ARRAY[4,5,6])] AS z
285-
FROM generate_series(1,2) x,
284+
ROW(y.*,ARRAY[4,5,6])] AS z
285+
FROM generate_series(1,2) x,
286286
generate_series(4,5) y) q;
287287
array_to_json
288288
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -308,12 +308,12 @@ SELECT row_to_json(row(1,'foo'));
308308
{"f1":1,"f2":"foo"}
309309
(1 row)
310310

311-
SELECT row_to_json(q)
312-
FROM (SELECT $$a$$ || x AS b,
313-
y AS c,
311+
SELECT row_to_json(q)
312+
FROM (SELECT $$a$$ || x AS b,
313+
y AS c,
314314
ARRAY[ROW(x.*,ARRAY[1,2,3]),
315-
ROW(y.*,ARRAY[4,5,6])] AS z
316-
FROM generate_series(1,2) x,
315+
ROW(y.*,ARRAY[4,5,6])] AS z
316+
FROM generate_series(1,2) x,
317317
generate_series(4,5) y) q;
318318
row_to_json
319319
--------------------------------------------------------------------
@@ -323,12 +323,12 @@ FROM (SELECT $$a$$ || x AS b,
323323
{"b":"a2","c":5,"z":[{"f1":2,"f2":[1,2,3]},{"f1":5,"f2":[4,5,6]}]}
324324
(4 rows)
325325

326-
SELECT row_to_json(q,true)
327-
FROM (SELECT $$a$$ || x AS b,
328-
y AS c,
326+
SELECT row_to_json(q,true)
327+
FROM (SELECT $$a$$ || x AS b,
328+
y AS c,
329329
ARRAY[ROW(x.*,ARRAY[1,2,3]),
330-
ROW(y.*,ARRAY[4,5,6])] AS z
331-
FROM generate_series(1,2) x,
330+
ROW(y.*,ARRAY[4,5,6])] AS z
331+
FROM generate_series(1,2) x,
332332
generate_series(4,5) y) q;
333333
row_to_json
334334
-----------------------------------------------------
@@ -349,7 +349,7 @@ FROM (SELECT $$a$$ || x AS b,
349349
CREATE TEMP TABLE rows AS
350350
SELECT x, 'txt' || x as y
351351
FROM generate_series(1,3) AS x;
352-
SELECT row_to_json(q,true)
352+
SELECT row_to_json(q,true)
353353
FROM rows q;
354354
row_to_json
355355
--------------

‎src/test/regress/sql/alter_table.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ DROP TABLE tmp2;
327327
-- NOT VALID with plan invalidation -- ensure we don't use a constraint for
328328
-- exclusion until validated
329329
set constraint_exclusion TO 'partition';
330-
create table nv_parent (d date);
330+
create table nv_parent (d date);
331331
create table nv_child_2010 () inherits (nv_parent);
332332
create table nv_child_2011 () inherits (nv_parent);
333333
alter table nv_child_2010 add check (d between '2010-01-01'::date and '2010-12-31'::date) not valid;
@@ -1348,7 +1348,7 @@ create domain alter1.posint integer check (value > 0);
13481348

13491349
create type alter1.ctype as (f1 int, f2 text);
13501350

1351-
create function alter1.same(alter1.ctype, alter1.ctype) returns boolean language sql
1351+
create function alter1.same(alter1.ctype, alter1.ctype) returns boolean language sql
13521352
as 'select $1.f1 is not distinct from $2.f1 and $1.f2 is not distinct from $2.f2';
13531353

13541354
create operator alter1.=(procedure = alter1.same, leftarg = alter1.ctype, rightarg = alter1.ctype);

‎src/test/regress/sql/create_function_3.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GRANT ALL ON SCHEMA temp_func_test TO public;
1111
SET search_path TO temp_func_test, public;
1212

1313
--
14-
-- ARGUMENT and RETURN TYPES
14+
-- ARGUMENT and RETURN TYPES
1515
--
1616
CREATE FUNCTION functest_A_1(text, date) RETURNS bool LANGUAGE 'sql'
1717
AS 'SELECT $1 = ''abcd'' AND $2 > ''2001-01-01''';

‎src/test/regress/sql/foreign_data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ DROP SERVER t1 CASCADE;
484484
DROP SERVER t2;
485485
DROP USER MAPPING FOR regress_test_role SERVER s6;
486486
-- This test causes some order dependent cascade detail output,
487-
-- so switch to terse mode for it.
487+
-- so switch to terse mode for it.
488488
\set VERBOSITY terse
489489
DROP FOREIGN DATA WRAPPER foo CASCADE;
490490
\set VERBOSITY default

0 commit comments

Comments
 (0)