More message style fixes

Discussion: https://postgr.es/m/20190515183005.GA26486@alvherre.pgsql

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index c39218f8dbb59c29a068184cc21d237e1311557f..6ffc3a62f6716470fb751213e6162400d29f455b 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -2793,7 +2793,7 @@ CopyFrom(CopyState cstate)
                {
                        ereport(ERROR,
                                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("cannot perform FREEZE on a partitioned table")));
+                                        errmsg("cannot perform COPY FREEZE on a partitioned table")));
                }
 
                /*
@@ -2808,13 +2808,13 @@ CopyFrom(CopyState cstate)
                if (!ThereAreNoPriorRegisteredSnapshots() || !ThereAreNoReadyPortals())
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-                                        errmsg("cannot perform FREEZE because of prior transaction activity")));
+                                        errmsg("cannot perform COPY FREEZE because of prior transaction activity")));
 
                if (cstate->rel->rd_createSubid != GetCurrentSubTransactionId() &&
                        cstate->rel->rd_newRelfilenodeSubid != GetCurrentSubTransactionId())
                        ereport(ERROR,
                                        (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                        errmsg("cannot perform FREEZE because the table was not created or truncated in the current subtransaction")));
+                                        errmsg("cannot perform COPY FREEZE because the table was not created or truncated in the current subtransaction")));
 
                ti_options |= TABLE_INSERT_FROZEN;
        }

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 4d48be0b92ee1b91591178150500d81679014ac2..0d32f2d6e3482279b102f1bf528fdbb833c3c42a 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -129,7 +129,7 @@ parse_publication_options(List *options,
                else
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("unrecognized publication parameter: %s", defel->defname)));
+                                        errmsg("unrecognized publication parameter: \"%s\"", defel->defname)));
        }
 }
 

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index a60a15193a434a024743aa4a2ad2693a23034d85..26c06e10e7c9e734009a00a02b156becc6b1599d 100644 (file)
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -185,7 +185,7 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
                else
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("unrecognized subscription parameter: %s", defel->defname)));
+                                        errmsg("unrecognized subscription parameter: \"%s\"", defel->defname)));
        }
 
        /*
@@ -198,17 +198,21 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
                if (enabled && *enabled_given && *enabled)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("connect = false and enabled = true are mutually exclusive options")));
+                       /*- translator: both %s are strings of the form "option = value" */
+                                        errmsg("%s and %s are mutually exclusive options",
+                                                       "connect = false", "enabled = true")));
 
                if (create_slot && create_slot_given && *create_slot)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("connect = false and create_slot = true are mutually exclusive options")));
+                                        errmsg("%s and %s are mutually exclusive options",
+                                                       "connect = false", "create_slot = true")));
 
                if (copy_data && copy_data_given && *copy_data)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("connect = false and copy_data = true are mutually exclusive options")));
+                                        errmsg("%s and %s are mutually exclusive options",
+                                                       "connect = false", "copy_data = true")));
 
                /* Change the defaults of other options. */
                *enabled = false;
@@ -225,22 +229,28 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
                if (enabled && *enabled_given && *enabled)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("slot_name = NONE and enabled = true are mutually exclusive options")));
+                       /*- translator: both %s are strings of the form "option = value" */
+                                        errmsg("%s and %s are mutually exclusive options",
+                                                       "slot_name = NONE", "enable = true")));
 
                if (create_slot && create_slot_given && *create_slot)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("slot_name = NONE and create_slot = true are mutually exclusive options")));
+                                        errmsg("%s and %s are mutually exclusive options",
+                                                       "slot_name = NONE", "create_slot = true")));
 
                if (enabled && !*enabled_given && *enabled)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("subscription with slot_name = NONE must also set enabled = false")));
+                       /*- translator: both %s are strings of the form "option = value" */
+                                        errmsg("subscription with %s must also set %s",
+                                                       "slot_name = NONE", "enabled = false")));
 
                if (create_slot && !create_slot_given && *create_slot)
                        ereport(ERROR,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("subscription with slot_name = NONE must also set create_slot = false")));
+                                        errmsg("subscription with %s must also set %s",
+                                                       "slot_name = NONE", "create_slot = false")));
        }
 }
 
@@ -487,9 +497,9 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)
        }
        else
                ereport(WARNING,
-                               (errmsg("tables were not subscribed, you will have to run "
-                                               "ALTER SUBSCRIPTION ... REFRESH PUBLICATION to "
-                                               "subscribe the tables")));
+               /* translator: %s is an SQL ALTER statement */
+                               (errmsg("tables were not subscribed, you will have to run %s to subscribe the tables",
+                                               "ALTER SUBSCRIPTION ... REFRESH PUBLICATION")));
 
        table_close(rel, RowExclusiveLock);
 
@@ -673,7 +683,8 @@ AlterSubscription(AlterSubscriptionStmt *stmt)
                                        if (sub->enabled && !slotname)
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_SYNTAX_ERROR),
-                                                                errmsg("cannot set slot_name = NONE for enabled subscription")));
+                                                                errmsg("cannot set %s for enabled subscription",
+                                                                               "slot_name = NONE")));
 
                                        if (slotname)
                                                values[Anum_pg_subscription_subslotname - 1] =
@@ -981,8 +992,9 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
                                (errmsg("could not connect to publisher when attempting to "
                                                "drop the replication slot \"%s\"", slotname),
                                 errdetail("The error was: %s", err),
-                                errhint("Use ALTER SUBSCRIPTION ... SET (slot_name = NONE) "
-                                                "to disassociate the subscription from the slot.")));
+               /* translator: %s is an SQL ALTER command */
+                                errhint("Use %s to disassociate the subscription from the slot.",
+                                                "ALTER SUBSCRIPTION ... SET (slot_name = NONE)")));
 
        PG_TRY();
        {

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index baeb13e6a0ca94d353afe421099978ccc4f759c7..bfcf9472d7af0a189a9e8502850136ff2fe84952 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -15116,14 +15116,14 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
                                if (strategy == PARTITION_STRATEGY_HASH)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                        errmsg("data type %s has no default hash operator class",
-                                                                       format_type_be(atttype)),
+                                                        errmsg("data type %s has no default operator class for access method \"%s\"",
+                                                                       format_type_be(atttype), "hash"),
                                                         errhint("You must specify a hash operator class or define a default hash operator class for the data type.")));
                                else
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                        errmsg("data type %s has no default btree operator class",
-                                                                       format_type_be(atttype)),
+                                                        errmsg("data type %s has no default operator class for access method \"%s\"",
+                                                                       format_type_be(atttype), "btree"),
                                                         errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
 
                        }

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 400558b552badfa9825afd70d8899d9b5e9c47db..bd6f3c8044589d1bfd89aad6adf43a4bed24df2a 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -2599,7 +2599,7 @@ transformCreateTableAsStmt(ParseState *pstate, CreateTableAsStmt *stmt)
                if (stmt->into->rel->relpersistence == RELPERSISTENCE_UNLOGGED)
                        ereport(ERROR,
                                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("materialized views cannot be UNLOGGED")));
+                                        errmsg("materialized views cannot be unlogged")));
 
                /*
                 * At runtime, we'll need a copy of the parsed-but-not-rewritten Query

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 71ffb1345b65d85fada027bf6ead236eea12702c..34315b8d1a42addbc00cfa9a4d1844a257671157 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -2028,7 +2028,7 @@ retry1:
                                continue;
                        ereport(COMMERROR,
                                        (errcode_for_socket_access(),
-                                        errmsg("failed to send GSSAPI negotiation response: %m)")));
+                                        errmsg("failed to send GSSAPI negotiation response: %m")));
                        return STATUS_ERROR;    /* close the connection */
                }
 
@@ -2651,11 +2651,12 @@ SIGHUP_handler(SIGNAL_ARGS)
                /* Reload authentication config files too */
                if (!load_hba())
                        ereport(LOG,
-                                       (errmsg("pg_hba.conf was not reloaded")));
+                       /* translator: %s is a configuration file */
+                                       (errmsg("%s was not reloaded", "pg_hba.conf")));
 
                if (!load_ident())
                        ereport(LOG,
-                                       (errmsg("pg_ident.conf was not reloaded")));
+                                       (errmsg("%s was not reloaded", "pg_ident.conf")));
 
 #ifdef USE_SSL
                /* Reload SSL configuration as well */

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 440b6aac4bcad506b4f30aa7c5bc42b8223f5218..8aa12ec9124772d0210e4034c045024419288ebf 100644 (file)
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -903,8 +903,9 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
                {
                        if (IsTransactionBlock())
                                ereport(ERROR,
-                                               (errmsg("CREATE_REPLICATION_SLOT ... EXPORT_SNAPSHOT "
-                                                               "must not be called inside a transaction")));
+                               /*- translator: %s is a CREATE_REPLICATION_SLOT statement */
+                                               (errmsg("%s must not be called inside a transaction",
+                                                               "CREATE_REPLICATION_SLOT ... EXPORT_SNAPSHOT")));
 
                        need_full_snapshot = true;
                }
@@ -912,23 +913,27 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
                {
                        if (!IsTransactionBlock())
                                ereport(ERROR,
-                                               (errmsg("CREATE_REPLICATION_SLOT ... USE_SNAPSHOT "
-                                                               "must be called inside a transaction")));
+                               /*- translator: %s is a CREATE_REPLICATION_SLOT statement */
+                                               (errmsg("%s must be called inside a transaction",
+                                                               "CREATE_REPLICATION_SLOT ... USE_SNAPSHOT")));
 
                        if (XactIsoLevel != XACT_REPEATABLE_READ)
                                ereport(ERROR,
-                                               (errmsg("CREATE_REPLICATION_SLOT ... USE_SNAPSHOT "
-                                                               "must be called in REPEATABLE READ isolation mode transaction")));
+                               /*- translator: %s is a CREATE_REPLICATION_SLOT statement */
+                                               (errmsg("%s must be called in REPEATABLE READ isolation mode transaction",
+                                                               "CREATE_REPLICATION_SLOT ... USE_SNAPSHOT")));
 
                        if (FirstSnapshotSet)
                                ereport(ERROR,
-                                               (errmsg("CREATE_REPLICATION_SLOT ... USE_SNAPSHOT "
-                                                               "must be called before any query")));
+                               /*- translator: %s is a CREATE_REPLICATION_SLOT statement */
+                                               (errmsg("%s must be called before any query",
+                                                               "CREATE_REPLICATION_SLOT ... USE_SNAPSHOT")));
 
                        if (IsSubTransaction())
                                ereport(ERROR,
-                                               (errmsg("CREATE_REPLICATION_SLOT ... USE_SNAPSHOT "
-                                                               "must not be called in a subtransaction")));
+                               /*- translator: %s is a CREATE_REPLICATION_SLOT statement */
+                                               (errmsg("%s must not be called in a subtransaction",
+                                                               "CREATE_REPLICATION_SLOT ... USE_SNAPSHOT")));
 
                        need_full_snapshot = true;
                }

diff --git a/src/backend/utils/adt/jsonpath.c b/src/backend/utils/adt/jsonpath.c
index d53d6d33113be825887ce4f88d716b0293c5d457..b7f0b4a35e3299f1fbdcbb5ddc7f6b34dcaf182b 100644 (file)
--- a/src/backend/utils/adt/jsonpath.c
+++ b/src/backend/utils/adt/jsonpath.c
@@ -179,7 +179,8 @@ jsonPathFromCstring(char *in, int len)
        if (!jsonpath)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for jsonpath: \"%s\"", in)));
+                                errmsg("invalid input syntax for type %s: \"%s\"", "jsonpath",
+                                               in)));
 
        flattenJsonPathParseItem(&buf, jsonpath->expr, 0, false);
 

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index 2789ed2371feaab89455aa3285e02b27afc5bf70..b6d6a243e528f9ecf9c864fd7e97283025dfb5ba 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -1934,7 +1934,7 @@ getJsonPathVariable(JsonPathExecContext *cxt, JsonPathItem *variable,
        {
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("cannot find jsonpath variable \"%s\"",
+                                errmsg("could not find jsonpath variable \"%s\"",
                                                pnstrdup(varName, varNameLength))));
        }
 

diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l
index 6ab7c5c9c64991d4f501ee3d8cb3961aa1cdedec..84d4f297a89a15ced2922edb4577e568b0bae287 100644 (file)
--- a/src/backend/utils/adt/jsonpath_scan.l
+++ b/src/backend/utils/adt/jsonpath_scan.l
@@ -539,7 +539,7 @@ addUnicodeChar(int ch)
        {
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type jsonpath"),
+                                errmsg("invalid input syntax for type %s", "jsonpath"),
                                 errdetail("Unicode escape values cannot be used for code "
                                                   "point values above 007F when the server encoding "
                                                   "is not UTF8.")));
@@ -555,7 +555,7 @@ addUnicode(int ch, int *hi_surrogate)
                if (*hi_surrogate != -1)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                        errmsg("invalid input syntax for type jsonpath"),
+                                        errmsg("invalid input syntax for type %s", "jsonpath"),
                                         errdetail("Unicode high surrogate must not follow "
                                                           "a high surrogate.")));
                *hi_surrogate = (ch & 0x3ff) << 10;
@@ -566,7 +566,7 @@ addUnicode(int ch, int *hi_surrogate)
                if (*hi_surrogate == -1)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                        errmsg("invalid input syntax for type jsonpath"),
+                                        errmsg("invalid input syntax for type %s", "jsonpath"),
                                         errdetail("Unicode low surrogate must follow a high "
                                                           "surrogate.")));
                ch = 0x10000 + *hi_surrogate + (ch & 0x3ff);
@@ -576,7 +576,7 @@ addUnicode(int ch, int *hi_surrogate)
        {
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type jsonpath"),
+                                errmsg("invalid input syntax for type %s", "jsonpath"),
                                 errdetail("Unicode low surrogate must follow a high "
                                                   "surrogate.")));
        }
@@ -618,7 +618,7 @@ parseUnicode(char *s, int l)
        {
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-                                errmsg("invalid input syntax for type jsonpath"),
+                                errmsg("invalid input syntax for type %s", "jsonpath"),
                                 errdetail("Unicode low surrogate must follow a high "
                                                   "surrogate.")));
        }

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index da6e2cb5848b02adb04b6ec96360ecf1cb3be3f8..2376bda497be1de102c67e7bfd3022bf9492451a 100644 (file)
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -1603,7 +1603,7 @@ icu_to_uchar(UChar **buff_uchar, const char *buff, size_t nbytes)
                                                          buff, nbytes, &status);
        if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR)
                ereport(ERROR,
-                               (errmsg("ucnv_toUChars failed: %s", u_errorName(status))));
+                               (errmsg("%s failed: %s", "ucnv_toUChars", u_errorName(status))));
 
        *buff_uchar = palloc((len_uchar + 1) * sizeof(**buff_uchar));
 
@@ -1612,7 +1612,7 @@ icu_to_uchar(UChar **buff_uchar, const char *buff, size_t nbytes)
                                                          buff, nbytes, &status);
        if (U_FAILURE(status))
                ereport(ERROR,
-                               (errmsg("ucnv_toUChars failed: %s", u_errorName(status))));
+                               (errmsg("%s failed: %s", "ucnv_toUChars", u_errorName(status))));
 
        return len_uchar;
 }
@@ -1641,7 +1641,8 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar)
                                                                 buff_uchar, len_uchar, &status);
        if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR)
                ereport(ERROR,
-                               (errmsg("ucnv_fromUChars failed: %s", u_errorName(status))));
+                               (errmsg("%s failed: %s", "ucnv_fromUChars",
+                                               u_errorName(status))));
 
        *result = palloc(len_result + 1);
 
@@ -1650,7 +1651,8 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar)
                                                                 buff_uchar, len_uchar, &status);
        if (U_FAILURE(status))
                ereport(ERROR,
-                               (errmsg("ucnv_fromUChars failed: %s", u_errorName(status))));
+                               (errmsg("%s failed: %s", "ucnv_fromUChars",
+                                               u_errorName(status))));
 
        return len_result;
 }

diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index ab44846e0b36a7765ac615ba7861de948867e13b..c5be472bcedff4c8ffaa60af947e3e0338a7639c 100644 (file)
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -423,7 +423,7 @@ parse_re_flags(pg_re_flags *flags, text *opts)
                                default:
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                                        errmsg("invalid regexp option: \"%c\"",
+                                                        errmsg("invalid regular expression option: \"%c\"",
                                                                        opt_p[i])));
                                        break;
                        }
@@ -920,7 +920,9 @@ regexp_match(PG_FUNCTION_ARGS)
        if (re_flags.glob)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("regexp_match does not support the global option"),
+               /* translator: %s is a SQL function name */
+                                errmsg("%s does not support the \"global\" option",
+                                               "regexp_match()"),
                                 errhint("Use the regexp_matches function instead.")));
 
        matchctx = setup_regexp_matches(orig_str, pattern, &re_flags,
@@ -1298,7 +1300,9 @@ regexp_split_to_table(PG_FUNCTION_ARGS)
                if (re_flags.glob)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("regexp_split_to_table does not support the global option")));
+                       /* translator: %s is a SQL function name */
+                                        errmsg("%s does not support the \"global\" option",
+                                                       "regexp_split_to_table()")));
                /* But we find all the matches anyway */
                re_flags.glob = true;
 
@@ -1351,7 +1355,9 @@ regexp_split_to_array(PG_FUNCTION_ARGS)
        if (re_flags.glob)
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                errmsg("regexp_split_to_array does not support the global option")));
+               /* translator: %s is a SQL function name */
+                                errmsg("%s does not support the \"global\" option",
+                                               "regexp_split_to_array()")));
        /* But we find all the matches anyway */
        re_flags.glob = true;