Message style improvements

petere · petere · commit 40fcfec82cf6 · 2016-07-25T22:07:44.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1467,7 +1467,7 @@ CreateExtensionInternal(CreateExtensionStmt stmt, List parents)`
`1467`	`1467`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`1468`	`1468`	`errmsg("required extension \"%s\" is not installed",`
`1469`	`1469`	`curreq),`
`1470`		`- errhint("Use CREATE EXTENSION CASCADE to install required extensions too.")));`
	`1470`	`+ errhint("Use CREATE EXTENSION ... CASCADE to install required extensions too.")));`
`1471`	`1471`	`}`
`1472`	`1472`
`1473`	`1473`	`reqschema = get_extension_schema(reqext);`
Original file line number	Diff line number	Diff line change
`@@ -2980,7 +2980,7 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,`
`2980`	`2980`	`if (pertrans->transfn.fn_strict && aggtranstype == INTERNALOID)`
`2981`	`2981`	`ereport(ERROR,`
`2982`	`2982`	`(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),`
`2983`		`- errmsg("combine function for aggregate %u must to be declared as strict",`
	`2983`	`+ errmsg("combine function for aggregate %u must be declared as STRICT",`
`2984`	`2984`	`aggref->aggfnoid)));`
`2985`	`2985`	`}`
`2986`	`2986`	`else`