Message style improvements

diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out
index 6a589247341dae28f9dace7ad57cd8fe157c3cad..e9daa8488ea6765b011ecb73bf2e20fc466a0024 100644 (file)
--- a/contrib/earthdistance/expected/earthdistance.out
+++ b/contrib/earthdistance/expected/earthdistance.out
@@ -9,7 +9,7 @@
 --
 CREATE EXTENSION earthdistance;  -- fail, must install cube first
 ERROR:  required extension "cube" is not installed
-HINT:  Use CREATE EXTENSION CASCADE to install required extensions too.
+HINT:  Use CREATE EXTENSION ... CASCADE to install required extensions too.
 CREATE EXTENSION cube;
 CREATE EXTENSION earthdistance;
 --

diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index e78e3b5b743bb3b0ecc8dc159b4f78fadf242599..518fefcf09bfffb89be1355d1b594badccfee026 100644 (file)
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -1467,7 +1467,7 @@ CreateExtensionInternal(CreateExtensionStmt *stmt, List *parents)
                                                (errcode(ERRCODE_UNDEFINED_OBJECT),
                                                 errmsg("required extension \"%s\" is not installed",
                                                                curreq),
-                                                errhint("Use CREATE EXTENSION CASCADE to install required extensions too.")));
+                                                errhint("Use CREATE EXTENSION ... CASCADE to install required extensions too.")));
                }
 
                reqschema = get_extension_schema(reqext);

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index b3187e666817a0d9ee357c6f3c45ba875ab1091c..1ec2515090fb2a4b723cbbd5c73c68426f5e4dd9 100644 (file)
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -2980,7 +2980,7 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
                if (pertrans->transfn.fn_strict && aggtranstype == INTERNALOID)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
-                                        errmsg("combine function for aggregate %u must to be declared as strict",
+                                        errmsg("combine function for aggregate %u must be declared as STRICT",
                                                        aggref->aggfnoid)));
        }
        else

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index fecf605541a070aa05405050e4e8b3d122381045..025a99e55afa434861f53e627fd687fdf45c366e 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -5276,13 +5276,13 @@ check_rolespec_name(const Node *node, const char *detail_msg)
                if (detail_msg)
                        ereport(ERROR,
                                        (errcode(ERRCODE_RESERVED_NAME),
-                                        errmsg("role \"%s\" is reserved",
+                                        errmsg("role name \"%s\" is reserved",
                                                        role->rolename),
                                         errdetail("%s", detail_msg)));
                else
                        ereport(ERROR,
                                        (errcode(ERRCODE_RESERVED_NAME),
-                                        errmsg("role \"%s\" is reserved",
+                                        errmsg("role name \"%s\" is reserved",
                                                        role->rolename)));
        }
 }

diff --git a/src/test/modules/test_extensions/expected/test_extensions.out b/src/test/modules/test_extensions/expected/test_extensions.out
index 105f53fb742ed2da8ae1dcee988e1eefb0232442..c3360c97cc5745ce2eee832e32a845ca3aeac1e5 100644 (file)
--- a/src/test/modules/test_extensions/expected/test_extensions.out
+++ b/src/test/modules/test_extensions/expected/test_extensions.out
@@ -1,7 +1,7 @@
 -- test some errors
 CREATE EXTENSION test_ext1;
 ERROR:  required extension "test_ext2" is not installed
-HINT:  Use CREATE EXTENSION CASCADE to install required extensions too.
+HINT:  Use CREATE EXTENSION ... CASCADE to install required extensions too.
 CREATE EXTENSION test_ext1 SCHEMA test_ext1;
 ERROR:  schema "test_ext1" does not exist
 CREATE EXTENSION test_ext1 SCHEMA test_ext;