Message style tweaks

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 22864de957bed885b63e8997aacdf151e5f59cdb..3bc350a11342bd65eb1712313b403bde494ee10d 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -6924,7 +6924,8 @@ ATPrepAlterColumnType(List **wqueue,
    else if (transform)
        ereport(ERROR,
                (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-             errmsg("ALTER TYPE USING is only supported on plain tables")));
+                errmsg("\"%s\" is not a table",
+                       RelationGetRelationName(rel))));
 
    if (tab->relkind == RELKIND_COMPOSITE_TYPE ||
        tab->relkind == RELKIND_FOREIGN_TABLE)

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index b64f837bf867abfaccd61b6ae08321e73241b57f..1be2ac68a587ce8610fde07cfa7bc45c5a0d5be0 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -1531,7 +1531,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
        if (index_rel->rd_rel->relam != get_am_oid(DEFAULT_INDEX_TYPE, false))
            ereport(ERROR,
                    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                    errmsg("index \"%s\" is not a b-tree", index_name),
+                    errmsg("index \"%s\" is not a btree", index_name),
                     parser_errposition(cxt->pstate, constraint->location)));
 
        /* Must get indclass the hard way */

diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c
index 119dd076cae7af5870b88a89f674177d583eca0d..b905206a29a710d4243ae290bbed6edf97e553d4 100644 (file)
--- a/src/backend/port/win32/crashdump.c
+++ b/src/backend/port/win32/crashdump.c
@@ -105,7 +105,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
        hDll = LoadLibrary("dbghelp.dll");
        if (hDll == NULL)
        {
-           write_stderr("could not load dbghelp.dll, cannot write crashdump\n");
+           write_stderr("could not load dbghelp.dll, cannot write crash dump\n");
            return EXCEPTION_CONTINUE_SEARCH;
        }
 
@@ -113,7 +113,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
 
        if (pDump == NULL)
        {
-           write_stderr("could not load required functions in dbghelp.dll, cannot write crashdump\n");
+           write_stderr("could not load required functions in dbghelp.dll, cannot write crash dump\n");
            return EXCEPTION_CONTINUE_SEARCH;
        }
 
@@ -144,16 +144,16 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
                              NULL);
        if (dumpFile == INVALID_HANDLE_VALUE)
        {
-           write_stderr("could not open crash dump file %s for writing: error code %u\n",
+           write_stderr("could not open crash dump file \"%s\" for writing: error code %u\n",
                         dumpPath, (unsigned int) GetLastError());
            return EXCEPTION_CONTINUE_SEARCH;
        }
 
        if ((*pDump) (selfProcHandle, selfPid, dumpFile, dumpType, &ExInfo,
                      NULL, NULL))
-           write_stderr("wrote crash dump to %s\n", dumpPath);
+           write_stderr("wrote crash dump to file \"%s\"\n", dumpPath);
        else
-           write_stderr("could not write crash dump to %s: error code %08x\n",
+           write_stderr("could not write crash dump to file \"%s\": error code %08x\n",
                         dumpPath, (unsigned int) GetLastError());
 
        CloseHandle(dumpFile);

diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index ce92dfcf171e011fe738bcf88048a27162aa858a..1707a746646f519c314b65e2d034570bd9b480f2 100644 (file)
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -882,7 +882,7 @@ OldSerXidAdd(TransactionId xid, SerCommitSeqNo minConflictCommitSeqNo)
            oldSerXidControl->warningIssued = true;
            ereport(WARNING,
                    (errmsg("memory for serializable conflict tracking is nearly exhausted"),
-                    errhint("There may be an idle transaction or a forgotten prepared transaction causing this.")));
+                    errhint("There might be an idle transaction or a forgotten prepared transaction causing this.")));
        }
    }
 

diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 9acbc2d4e51485004f0a01574bac588edc44cf4b..d1113ed5d300537092cc00d4d81d708c7572d7f6 100644 (file)
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3937,7 +3937,7 @@ text_format_string_conversion(StringInfo buf, char conversion,
        else if (conversion == 'I')
            ereport(ERROR,
                    (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-                    errmsg("NULL cannot be escaped as an SQL identifier")));
+                    errmsg("null values cannot be formatted as an SQL identifier")));
        return;
    }
 

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index c5782e2de2f9dbb92dfb3cdb62540f068be397f7..7b7d26089dd3ad6607f4e86c40818937ef7e6c31 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -877,7 +877,7 @@ static struct config_bool ConfigureNamesBool[] =
    },
    {
        {"restart_after_crash", PGC_SIGHUP, ERROR_HANDLING_OPTIONS,
-           gettext_noop("Reinitialize after backend crash."),
+           gettext_noop("Reinitialize server after backend crash."),
            NULL
        },
        &restart_after_crash,
@@ -1368,7 +1368,7 @@ static struct config_bool ConfigureNamesBool[] =
 
    {
        {"hot_standby_feedback", PGC_SIGHUP, WAL_STANDBY_SERVERS,
-           gettext_noop("Allows feedback from a hot standby primary that will avoid query conflicts."),
+           gettext_noop("Allows feedback from a hot standby to the primary that will avoid query conflicts."),
            NULL
        },
        &hot_standby_feedback,
@@ -1557,7 +1557,7 @@ static struct config_int ConfigureNamesInt[] =
 
    {
        {"wal_receiver_status_interval", PGC_SIGHUP, WAL_STANDBY_SERVERS,
-           gettext_noop("Sets the maximum interval between WAL receiver status reports to the master."),
+           gettext_noop("Sets the maximum interval between WAL receiver status reports to the primary."),
            NULL,
            GUC_UNIT_S
        },
@@ -2955,7 +2955,7 @@ static struct config_string ConfigureNamesString[] =
 
    {
        {"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
-           gettext_noop("List of potential standby names to synchronize with."),
+           gettext_noop("List of names of potential synchronous standbys."),
            NULL,
            GUC_LIST_INPUT
        },

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index def850ba893216f76b765de6972a84b64fe14e7f..2b3eddfc8b37b4a2ce827f2663943961f51956eb 100644 (file)
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -694,8 +694,8 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;           -- ERROR
 ERROR:  "ft1" is not a table or view
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
-ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
-ERROR:  ALTER TYPE USING is only supported on plain tables
+ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
+ERROR:  "ft1" is not a table
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
 -- can't change the column type if it's used elsewhere

diff --git a/src/test/regress/expected/text.out b/src/test/regress/expected/text.out
index b84e8544d5e084696b838f9b3199e6d817992f10..f5cb5e2509a53171157d41d15215503ecfa37d15 100644 (file)
--- a/src/test/regress/expected/text.out
+++ b/src/test/regress/expected/text.out
@@ -203,7 +203,7 @@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
 
 -- should fail, sql identifier cannot be NULL
 select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
-ERROR:  NULL cannot be escaped as an SQL identifier
+ERROR:  null values cannot be formatted as an SQL identifier
 -- check positional placeholders
 select format('%1$s %3$s', 1, 2, 3);
  format 

diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index d3239216c10f8e9e3f6589b1fa8adf8e8dd8e5b8..58e506047744b2a39e64775e497026af607b8856 100644 (file)
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -294,7 +294,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;          -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;           -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
-ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
+ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
 -- can't change the column type if it's used elsewhere