mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2016-07-25 22:07:44 -04:00
parent 1804d1555f
commit 40fcfec82c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/earthdistance/expected/earthdistance.out
View File

@ -9,7 +9,7 @@
-- --
CREATE EXTENSION earthdistance; -- fail, must install cube first CREATE EXTENSION earthdistance; -- fail, must install cube first
ERROR: required extension "cube" is not installed 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 cube;
CREATE EXTENSION earthdistance; CREATE EXTENSION earthdistance;
-- --

2
src/backend/commands/extension.c
View File

@ -1467,7 +1467,7 @@ CreateExtensionInternal(CreateExtensionStmt *stmt, List *parents)
(errcode(ERRCODE_UNDEFINED_OBJECT), (errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("required extension \"%s\" is not installed", errmsg("required extension \"%s\" is not installed",
curreq), 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); reqschema = get_extension_schema(reqext);

2
src/backend/executor/nodeAgg.c
View File

@ -2980,7 +2980,7 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
if (pertrans->transfn.fn_strict && aggtranstype == INTERNALOID) if (pertrans->transfn.fn_strict && aggtranstype == INTERNALOID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), (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))); aggref->aggfnoid)));
} }
else else

4
src/backend/utils/adt/acl.c
View File

@ -5276,13 +5276,13 @@ check_rolespec_name(const Node *node, const char *detail_msg)
if (detail_msg) if (detail_msg)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_RESERVED_NAME), (errcode(ERRCODE_RESERVED_NAME),
errmsg("role \"%s\" is reserved", errmsg("role name \"%s\" is reserved",
role->rolename), role->rolename),
errdetail("%s", detail_msg))); errdetail("%s", detail_msg)));
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_RESERVED_NAME), (errcode(ERRCODE_RESERVED_NAME),
errmsg("role \"%s\" is reserved", errmsg("role name \"%s\" is reserved",
role->rolename))); role->rolename)));
} }
} }

2
src/test/modules/test_extensions/expected/test_extensions.out
View File

@ -1,7 +1,7 @@
-- test some errors -- test some errors
CREATE EXTENSION test_ext1; CREATE EXTENSION test_ext1;
ERROR: required extension "test_ext2" is not installed 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; CREATE EXTENSION test_ext1 SCHEMA test_ext1;
ERROR: schema "test_ext1" does not exist ERROR: schema "test_ext1" does not exist
CREATE EXTENSION test_ext1 SCHEMA test_ext; CREATE EXTENSION test_ext1 SCHEMA test_ext;