aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/commands/extension.c2
-rw-r--r--src/backend/executor/nodeAgg.c2
-rw-r--r--src/backend/utils/adt/acl.c4
-rw-r--r--src/test/modules/test_extensions/expected/test_extensions.out2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index e78e3b5b743..518fefcf09b 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 b3187e66681..1ec2515090f 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 fecf605541a..025a99e55af 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 105f53fb742..c3360c97cc5 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;