database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-06 19:59:18 +03:00
Code

Fix grammar in error message

Browse Source
This commit is contained in:
Peter Eisentraut 2019-05-09 09:14:37 +02:00
parent 2d7d946cd3
commit 02daece4ab
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/plpgsql.sgml
View File

@ -5165,10 +5165,10 @@ END;
$$; $$;
SELECT foo(); SELECT foo();
WARNING: number of source and target fields in assignment do not match WARNING: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_warnings is active. DETAIL: strict_multi_assignment check of extra_warnings is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
WARNING: number of source and target fields in assignment do not match WARNING: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_warnings is active. DETAIL: strict_multi_assignment check of extra_warnings is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.

8
src/pl/plpgsql/src/pl_exec.c
View File

@ -6993,7 +6993,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
if (strict_multiassignment_level) if (strict_multiassignment_level)
ereport(strict_multiassignment_level, ereport(strict_multiassignment_level,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("number of source and target fields in assignment do not match"), errmsg("number of source and target fields in assignment does not match"),
/* translator: %s represents a name of an extra check */ /* translator: %s represents a name of an extra check */
errdetail("%s check of %s is active.", errdetail("%s check of %s is active.",
"strict_multi_assignment", "strict_multi_assignment",
@ -7027,7 +7027,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
if (anum < td_natts) if (anum < td_natts)
ereport(strict_multiassignment_level, ereport(strict_multiassignment_level,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("number of source and target fields in assignment do not match"), errmsg("number of source and target fields in assignment does not match"),
/* translator: %s represents a name of an extra check */ /* translator: %s represents a name of an extra check */
errdetail("%s check of %s is active.", errdetail("%s check of %s is active.",
"strict_multi_assignment", "strict_multi_assignment",
@ -7101,7 +7101,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
if (strict_multiassignment_level) if (strict_multiassignment_level)
ereport(strict_multiassignment_level, ereport(strict_multiassignment_level,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("number of source and target fields in assignment do not match"), errmsg("number of source and target fields in assignment does not match"),
/* translator: %s represents a name of an extra check */ /* translator: %s represents a name of an extra check */
errdetail("%s check of %s is active.", errdetail("%s check of %s is active.",
"strict_multi_assignment", "strict_multi_assignment",
@ -7127,7 +7127,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
if (anum < td_natts) if (anum < td_natts)
ereport(strict_multiassignment_level, ereport(strict_multiassignment_level,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("number of source and target fields in assignment do not match"), errmsg("number of source and target fields in assignment does not match"),
/* translator: %s represents a name of an extra check */ /* translator: %s represents a name of an extra check */
errdetail("%s check of %s is active.", errdetail("%s check of %s is active.",
"strict_multi_assignment", "strict_multi_assignment",

12
src/test/regress/expected/plpgsql.out
View File

@ -2899,10 +2899,10 @@ begin
select 1,2,3 into x, y; select 1,2,3 into x, y;
end end
$$; $$;
WARNING: number of source and target fields in assignment do not match WARNING: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_warnings is active. DETAIL: strict_multi_assignment check of extra_warnings is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
WARNING: number of source and target fields in assignment do not match WARNING: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_warnings is active. DETAIL: strict_multi_assignment check of extra_warnings is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
set plpgsql.extra_errors to 'strict_multi_assignment'; set plpgsql.extra_errors to 'strict_multi_assignment';
@ -2916,7 +2916,7 @@ begin
select 1,2,3 into x, y; select 1,2,3 into x, y;
end end
$$; $$;
ERROR: number of source and target fields in assignment do not match ERROR: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_errors is active. DETAIL: strict_multi_assignment check of extra_errors is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
CONTEXT: PL/pgSQL function inline_code_block line 6 at SQL statement CONTEXT: PL/pgSQL function inline_code_block line 6 at SQL statement
@ -2935,7 +2935,7 @@ begin
end; end;
$$; $$;
NOTICE: ok NOTICE: ok
ERROR: number of source and target fields in assignment do not match ERROR: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_errors is active. DETAIL: strict_multi_assignment check of extra_errors is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
CONTEXT: PL/pgSQL function inline_code_block line 8 at SQL statement CONTEXT: PL/pgSQL function inline_code_block line 8 at SQL statement
@ -2949,7 +2949,7 @@ begin
end; end;
$$; $$;
NOTICE: ok NOTICE: ok
ERROR: number of source and target fields in assignment do not match ERROR: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_errors is active. DETAIL: strict_multi_assignment check of extra_errors is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
CONTEXT: PL/pgSQL function inline_code_block line 7 at SQL statement CONTEXT: PL/pgSQL function inline_code_block line 7 at SQL statement
@ -2960,7 +2960,7 @@ begin
select 1 into t; -- should fail; select 1 into t; -- should fail;
end; end;
$$; $$;
ERROR: number of source and target fields in assignment do not match ERROR: number of source and target fields in assignment does not match
DETAIL: strict_multi_assignment check of extra_errors is active. DETAIL: strict_multi_assignment check of extra_errors is active.
HINT: Make sure the query returns the exact list of columns. HINT: Make sure the query returns the exact list of columns.
CONTEXT: PL/pgSQL function inline_code_block line 5 at SQL statement CONTEXT: PL/pgSQL function inline_code_block line 5 at SQL statement