Skip to content

Commit b3efa27

Browse files
Fix spelling and punctuation
Remove trailing periods from pg_log_error emitted strings as only hint and detail level error messages should be punctuated. Also reword the usage screen which was missing a word. Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com> Discussion: https://postgr.es/m/20231130.105223.554982964895179414.horikyota.ntt@gmail.com Discussion: https://postgr.es/m/20231130.103900.2069212175914114279.horikyota.ntt@gmail.com
1 parent c3f4a84 commit b3efa27

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/bin/pg_dump/pg_dump.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ help(const char *progname)
11191119
" including child and partition tables\n"));
11201120
printf(_(" --extra-float-digits=NUM override default setting for extra_float_digits\n"));
11211121
printf(_(" --filter=FILENAME include or exclude objects and data from dump\n"
1122-
" based expressions in FILENAME\n"));
1122+
" based on expressions in FILENAME\n"));
11231123
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
11241124
printf(_(" --include-foreign-data=PATTERN\n"
11251125
" include data of foreign tables on foreign\n"
@@ -18812,7 +18812,7 @@ read_dump_filters(const char *filename, DumpOptions *dopt)
1881218812
case FILTER_OBJECT_TYPE_TABLE_DATA:
1881318813
case FILTER_OBJECT_TYPE_TABLE_DATA_AND_CHILDREN:
1881418814
case FILTER_OBJECT_TYPE_TRIGGER:
18815-
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."),
18815+
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"),
1881618816
"include",
1881718817
filter_object_type_name(objtype));
1881818818
exit_nicely(1);
@@ -18851,7 +18851,7 @@ read_dump_filters(const char *filename, DumpOptions *dopt)
1885118851
case FILTER_OBJECT_TYPE_TRIGGER:
1885218852
case FILTER_OBJECT_TYPE_EXTENSION:
1885318853
case FILTER_OBJECT_TYPE_FOREIGN_DATA:
18854-
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."),
18854+
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"),
1885518855
"exclude",
1885618856
filter_object_type_name(objtype));
1885718857
exit_nicely(1);

src/bin/pg_dump/pg_dumpall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ read_dumpall_filters(const char *filename, SimpleStringList *pattern)
19691969
{
19701970
if (comtype == FILTER_COMMAND_TYPE_INCLUDE)
19711971
{
1972-
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."),
1972+
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"),
19731973
"include",
19741974
filter_object_type_name(objtype));
19751975
exit_nicely(1);
@@ -1989,7 +1989,7 @@ read_dumpall_filters(const char *filename, SimpleStringList *pattern)
19891989
case FILTER_OBJECT_TYPE_SCHEMA:
19901990
case FILTER_OBJECT_TYPE_TABLE:
19911991
case FILTER_OBJECT_TYPE_TABLE_AND_CHILDREN:
1992-
pg_log_filter_error(&fstate, _("unsupported filter object."));
1992+
pg_log_filter_error(&fstate, _("unsupported filter object"));
19931993
exit_nicely(1);
19941994
break;
19951995

src/bin/pg_dump/pg_restore.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ read_restore_filters(const char *filename, RestoreOptions *opts)
535535
case FILTER_OBJECT_TYPE_DATABASE:
536536
case FILTER_OBJECT_TYPE_EXTENSION:
537537
case FILTER_OBJECT_TYPE_FOREIGN_DATA:
538-
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."),
538+
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"),
539539
"include",
540540
filter_object_type_name(objtype));
541541
exit_nicely(1);
@@ -581,7 +581,7 @@ read_restore_filters(const char *filename, RestoreOptions *opts)
581581
case FILTER_OBJECT_TYPE_TABLE:
582582
case FILTER_OBJECT_TYPE_TABLE_AND_CHILDREN:
583583
case FILTER_OBJECT_TYPE_TRIGGER:
584-
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."),
584+
pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"),
585585
"exclude",
586586
filter_object_type_name(objtype));
587587
exit_nicely(1);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy