From b3efa270b5192f0c72dc26f0ea1bc795ad8516c3 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 30 Nov 2023 10:56:53 +0100 Subject: [PATCH] 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 Discussion: https://postgr.es/m/20231130.105223.554982964895179414.horikyota.ntt@gmail.com Discussion: https://postgr.es/m/20231130.103900.2069212175914114279.horikyota.ntt@gmail.com --- src/bin/pg_dump/pg_dump.c | 6 +++--- src/bin/pg_dump/pg_dumpall.c | 4 ++-- src/bin/pg_dump/pg_restore.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 57c6836b88..8c0b5486b9 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -1119,7 +1119,7 @@ help(const char *progname) " including child and partition tables\n")); printf(_(" --extra-float-digits=NUM override default setting for extra_float_digits\n")); printf(_(" --filter=FILENAME include or exclude objects and data from dump\n" - " based expressions in FILENAME\n")); + " based on expressions in FILENAME\n")); printf(_(" --if-exists use IF EXISTS when dropping objects\n")); printf(_(" --include-foreign-data=PATTERN\n" " include data of foreign tables on foreign\n" @@ -18812,7 +18812,7 @@ read_dump_filters(const char *filename, DumpOptions *dopt) case FILTER_OBJECT_TYPE_TABLE_DATA: case FILTER_OBJECT_TYPE_TABLE_DATA_AND_CHILDREN: case FILTER_OBJECT_TYPE_TRIGGER: - pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."), + pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"), "include", filter_object_type_name(objtype)); exit_nicely(1); @@ -18851,7 +18851,7 @@ read_dump_filters(const char *filename, DumpOptions *dopt) case FILTER_OBJECT_TYPE_TRIGGER: case FILTER_OBJECT_TYPE_EXTENSION: case FILTER_OBJECT_TYPE_FOREIGN_DATA: - pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."), + pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"), "exclude", filter_object_type_name(objtype)); exit_nicely(1); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 1b974cf7e8..92389353a4 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -1969,7 +1969,7 @@ read_dumpall_filters(const char *filename, SimpleStringList *pattern) { if (comtype == FILTER_COMMAND_TYPE_INCLUDE) { - pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."), + pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"), "include", filter_object_type_name(objtype)); exit_nicely(1); @@ -1989,7 +1989,7 @@ read_dumpall_filters(const char *filename, SimpleStringList *pattern) case FILTER_OBJECT_TYPE_SCHEMA: case FILTER_OBJECT_TYPE_TABLE: case FILTER_OBJECT_TYPE_TABLE_AND_CHILDREN: - pg_log_filter_error(&fstate, _("unsupported filter object.")); + pg_log_filter_error(&fstate, _("unsupported filter object")); exit_nicely(1); break; diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 1459e02263..c3beacdec1 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -535,7 +535,7 @@ read_restore_filters(const char *filename, RestoreOptions *opts) case FILTER_OBJECT_TYPE_DATABASE: case FILTER_OBJECT_TYPE_EXTENSION: case FILTER_OBJECT_TYPE_FOREIGN_DATA: - pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."), + pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"), "include", filter_object_type_name(objtype)); exit_nicely(1); @@ -581,7 +581,7 @@ read_restore_filters(const char *filename, RestoreOptions *opts) case FILTER_OBJECT_TYPE_TABLE: case FILTER_OBJECT_TYPE_TABLE_AND_CHILDREN: case FILTER_OBJECT_TYPE_TRIGGER: - pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed."), + pg_log_filter_error(&fstate, _("%s filter for \"%s\" is not allowed"), "exclude", filter_object_type_name(objtype)); exit_nicely(1);