From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 26 Jul 2016 02:07:44 +0000 (-0400)
Subject: Message style improvements
X-Git-Tag: REL9_6_BETA4~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40fcfec82cf695d520f2dd91ee437fa75dea4ca7;p=postgresql

Message style improvements
---

diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out
index 6a58924734..e9daa8488e 100644
--- 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 e78e3b5b74..518fefcf09 100644
--- 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 b3187e6668..1ec2515090 100644
--- 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 fecf605541..025a99e55a 100644
--- 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 105f53fb74..c3360c97cc 100644
--- 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;