Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit740ee42

Browse files
committed
Make some messages more consistent in style
1 parenta0bfb7b commit740ee42

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

‎src/backend/catalog/pg_proc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ ProcedureCreate(const char *procedureName,
246246
ereport(ERROR,
247247
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
248248
errmsg("cannot determine result data type"),
249-
errdetail("A function returningANYRANGE must have at least oneANYRANGE argument.")));
249+
errdetail("A function returning\"anyrange\" must have at least one\"anyrange\" argument.")));
250250

251251
if ((returnType==INTERNALOID||internalOutParam)&& !internalInParam)
252252
ereport(ERROR,

‎src/backend/commands/vacuumlazy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
311311
"pages: %d removed, %d remain\n"
312312
"tuples: %.0f removed, %.0f remain\n"
313313
"buffer usage: %d hits, %d misses, %d dirtied\n"
314-
"avg read rate: %.3fMiB/s, avg write rate: %.3fMiB/s\n"
314+
"avg read rate: %.3fMB/s, avg write rate: %.3fMB/s\n"
315315
"system usage: %s",
316316
get_database_name(MyDatabaseId),
317317
get_namespace_name(RelationGetNamespace(onerel)),

‎src/backend/parser/parse_coerce.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
16941694
if (!OidIsValid(range_typelem))
16951695
ereport(ERROR,
16961696
(errcode(ERRCODE_DATATYPE_MISMATCH),
1697-
errmsg("argument declared \"anyrange\" is not a range but type %s",
1697+
errmsg("argument declared \"anyrange\" is not a rangetypebut type %s",
16981698
format_type_be(range_typeid))));
16991699
}
17001700

@@ -1915,7 +1915,7 @@ resolve_generic_type(Oid declared_type,
19151915
if (!OidIsValid(range_typelem))
19161916
ereport(ERROR,
19171917
(errcode(ERRCODE_DATATYPE_MISMATCH),
1918-
errmsg("argument declared \"anyrange\" is not a range but type %s",
1918+
errmsg("argument declared \"anyrange\" is not a rangetypebut type %s",
19191919
format_type_be(context_base_type))));
19201920
returnrange_typelem;
19211921
}

‎src/test/regress/expected/rangetypes.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ drop function anyarray_anyrange_func(anyarray, anyrange);
11801180
create function bogus_func(anyelement)
11811181
returns anyrange as 'select int4range(1,10)' language sql;
11821182
ERROR: cannot determine result data type
1183-
DETAIL: A function returningANYRANGE must have at least oneANYRANGE argument.
1183+
DETAIL: A function returning"anyrange" must have at least one"anyrange" argument.
11841184
-- should fail
11851185
create function bogus_func(int)
11861186
returns anyrange as 'select int4range(1,10)' language sql;
@@ -1287,14 +1287,14 @@ select * from table_succeed(123, int4range(1,11));
12871287
create function outparam_fail(i anyelement, out r anyrange, out t text)
12881288
as $$ select '[1,10]', 'foo' $$ language sql;
12891289
ERROR: cannot determine result data type
1290-
DETAIL: A function returningANYRANGE must have at least oneANYRANGE argument.
1290+
DETAIL: A function returning"anyrange" must have at least one"anyrange" argument.
12911291
--should fail
12921292
create function inoutparam_fail(inout i anyelement, out r anyrange)
12931293
as $$ select $1, '[1,10]' $$ language sql;
12941294
ERROR: cannot determine result data type
1295-
DETAIL: A function returningANYRANGE must have at least oneANYRANGE argument.
1295+
DETAIL: A function returning"anyrange" must have at least one"anyrange" argument.
12961296
--should fail
12971297
create function table_fail(i anyelement) returns table(i anyelement, r anyrange)
12981298
as $$ select $1, '[1,10]' $$ language sql;
12991299
ERROR: cannot determine result data type
1300-
DETAIL: A function returningANYRANGE must have at least oneANYRANGE argument.
1300+
DETAIL: A function returning"anyrange" must have at least one"anyrange" argument.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp