Make some messages more consistent in style

diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index ba73264c60c37ee7483c09deb4bdef464456af2a..99d2559d0b8007c5c36ad1fa229a0b4207802df1 100644 (file)
--- 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 fc18b27427b646a3528aa61c428c416b1f60e225..b0a383bccff01d25065dc24f3f31c221808d720a 100644 (file)
--- 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 f477730ad53d297b01d1132c54117002a67c4500..f94a16344b0d6f31f64b00548555f86d45bde1fe 100644 (file)
--- 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 1023c4ef3e8f8086b60b77b09b051bce5ddca5ab..0cb6e53bf0773f2d59e391b97e4004b31e21ea7a 100644 (file)
--- 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.