diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-12-20 23:39:33 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-12-21 00:10:46 -0500 |
| commit | 740ee42da5fc07e5b1be5c358673224d99cb2aae (patch) | |
| tree | 0a7affd0dfb1c72cc94c145f3471ae8cad6b9bea /src | |
| parent | a0bfb7b36e0795a1c69c86b4184ee952dbb650d1 (diff) | |
| download | postgresql-740ee42da5fc07e5b1be5c358673224d99cb2aae.tar.gz postgresql-740ee42da5fc07e5b1be5c358673224d99cb2aae.zip | |
Make some messages more consistent in style
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/pg_proc.c | 2 | ||||
| -rw-r--r-- | src/backend/commands/vacuumlazy.c | 2 | ||||
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/rangetypes.out | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index ba73264c60c..99d2559d0b8 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -246,7 +246,7 @@ ProcedureCreate(const char *procedureName, ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), errmsg("cannot determine result data type"), - errdetail("A function returning ANYRANGE must have at least one ANYRANGE argument."))); + errdetail("A function returning \"anyrange\" must have at least one \"anyrange\" argument."))); if ((returnType == INTERNALOID || internalOutParam) && !internalInParam) ereport(ERROR, diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index fc18b27427b..b0a383bccff 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -311,7 +311,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt, "pages: %d removed, %d remain\n" "tuples: %.0f removed, %.0f remain\n" "buffer usage: %d hits, %d misses, %d dirtied\n" - "avg read rate: %.3f MiB/s, avg write rate: %.3f MiB/s\n" + "avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n" "system usage: %s", get_database_name(MyDatabaseId), get_namespace_name(RelationGetNamespace(onerel)), diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index f477730ad53..f94a16344b0 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -1694,7 +1694,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types, if (!OidIsValid(range_typelem)) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("argument declared \"anyrange\" is not a range but type %s", + errmsg("argument declared \"anyrange\" is not a range type but type %s", format_type_be(range_typeid)))); } @@ -1915,7 +1915,7 @@ resolve_generic_type(Oid declared_type, if (!OidIsValid(range_typelem)) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("argument declared \"anyrange\" is not a range but type %s", + errmsg("argument declared \"anyrange\" is not a range type but type %s", format_type_be(context_base_type)))); return range_typelem; } diff --git a/src/test/regress/expected/rangetypes.out b/src/test/regress/expected/rangetypes.out index 1023c4ef3e8..0cb6e53bf07 100644 --- a/src/test/regress/expected/rangetypes.out +++ b/src/test/regress/expected/rangetypes.out @@ -1180,7 +1180,7 @@ drop function anyarray_anyrange_func(anyarray, anyrange); create function bogus_func(anyelement) returns anyrange as 'select int4range(1,10)' language sql; ERROR: cannot determine result data type -DETAIL: A function returning ANYRANGE must have at least one ANYRANGE argument. +DETAIL: A function returning "anyrange" must have at least one "anyrange" argument. -- should fail create function bogus_func(int) returns anyrange as 'select int4range(1,10)' language sql; @@ -1287,14 +1287,14 @@ select * from table_succeed(123, int4range(1,11)); create function outparam_fail(i anyelement, out r anyrange, out t text) as $$ select '[1,10]', 'foo' $$ language sql; ERROR: cannot determine result data type -DETAIL: A function returning ANYRANGE must have at least one ANYRANGE argument. +DETAIL: A function returning "anyrange" must have at least one "anyrange" argument. --should fail create function inoutparam_fail(inout i anyelement, out r anyrange) as $$ select $1, '[1,10]' $$ language sql; ERROR: cannot determine result data type -DETAIL: A function returning ANYRANGE must have at least one ANYRANGE argument. +DETAIL: A function returning "anyrange" must have at least one "anyrange" argument. --should fail create function table_fail(i anyelement) returns table(i anyelement, r anyrange) as $$ select $1, '[1,10]' $$ language sql; ERROR: cannot determine result data type -DETAIL: A function returning ANYRANGE must have at least one ANYRANGE argument. +DETAIL: A function returning "anyrange" must have at least one "anyrange" argument. |