Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 02daece

Browse files
committed
Fix grammar in error message
1 parent 2d7d946 commit 02daece

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

doc/src/sgml/plpgsql.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5165,10 +5165,10 @@ END;
51655165
$$;
51665166

51675167
SELECT foo();
5168-
WARNING: number of source and target fields in assignment do not match
5168+
WARNING: number of source and target fields in assignment does not match
51695169
DETAIL: strict_multi_assignment check of extra_warnings is active.
51705170
HINT: Make sure the query returns the exact list of columns.
5171-
WARNING: number of source and target fields in assignment do not match
5171+
WARNING: number of source and target fields in assignment does not match
51725172
DETAIL: strict_multi_assignment check of extra_warnings is active.
51735173
HINT: Make sure the query returns the exact list of columns.
51745174

src/pl/plpgsql/src/pl_exec.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -6993,7 +6993,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
69936993
if (strict_multiassignment_level)
69946994
ereport(strict_multiassignment_level,
69956995
(errcode(ERRCODE_DATATYPE_MISMATCH),
6996-
errmsg("number of source and target fields in assignment do not match"),
6996+
errmsg("number of source and target fields in assignment does not match"),
69976997
/* translator: %s represents a name of an extra check */
69986998
errdetail("%s check of %s is active.",
69996999
"strict_multi_assignment",
@@ -7027,7 +7027,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
70277027
if (anum < td_natts)
70287028
ereport(strict_multiassignment_level,
70297029
(errcode(ERRCODE_DATATYPE_MISMATCH),
7030-
errmsg("number of source and target fields in assignment do not match"),
7030+
errmsg("number of source and target fields in assignment does not match"),
70317031
/* translator: %s represents a name of an extra check */
70327032
errdetail("%s check of %s is active.",
70337033
"strict_multi_assignment",
@@ -7101,7 +7101,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
71017101
if (strict_multiassignment_level)
71027102
ereport(strict_multiassignment_level,
71037103
(errcode(ERRCODE_DATATYPE_MISMATCH),
7104-
errmsg("number of source and target fields in assignment do not match"),
7104+
errmsg("number of source and target fields in assignment does not match"),
71057105
/* translator: %s represents a name of an extra check */
71067106
errdetail("%s check of %s is active.",
71077107
"strict_multi_assignment",
@@ -7127,7 +7127,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
71277127
if (anum < td_natts)
71287128
ereport(strict_multiassignment_level,
71297129
(errcode(ERRCODE_DATATYPE_MISMATCH),
7130-
errmsg("number of source and target fields in assignment do not match"),
7130+
errmsg("number of source and target fields in assignment does not match"),
71317131
/* translator: %s represents a name of an extra check */
71327132
errdetail("%s check of %s is active.",
71337133
"strict_multi_assignment",

src/test/regress/expected/plpgsql.out

+6-6
Original file line numberDiff line numberDiff line change
@@ -2899,10 +2899,10 @@ begin
28992899
select 1,2,3 into x, y;
29002900
end
29012901
$$;
2902-
WARNING: number of source and target fields in assignment do not match
2902+
WARNING: number of source and target fields in assignment does not match
29032903
DETAIL: strict_multi_assignment check of extra_warnings is active.
29042904
HINT: Make sure the query returns the exact list of columns.
2905-
WARNING: number of source and target fields in assignment do not match
2905+
WARNING: number of source and target fields in assignment does not match
29062906
DETAIL: strict_multi_assignment check of extra_warnings is active.
29072907
HINT: Make sure the query returns the exact list of columns.
29082908
set plpgsql.extra_errors to 'strict_multi_assignment';
@@ -2916,7 +2916,7 @@ begin
29162916
select 1,2,3 into x, y;
29172917
end
29182918
$$;
2919-
ERROR: number of source and target fields in assignment do not match
2919+
ERROR: number of source and target fields in assignment does not match
29202920
DETAIL: strict_multi_assignment check of extra_errors is active.
29212921
HINT: Make sure the query returns the exact list of columns.
29222922
CONTEXT: PL/pgSQL function inline_code_block line 6 at SQL statement
@@ -2935,7 +2935,7 @@ begin
29352935
end;
29362936
$$;
29372937
NOTICE: ok
2938-
ERROR: number of source and target fields in assignment do not match
2938+
ERROR: number of source and target fields in assignment does not match
29392939
DETAIL: strict_multi_assignment check of extra_errors is active.
29402940
HINT: Make sure the query returns the exact list of columns.
29412941
CONTEXT: PL/pgSQL function inline_code_block line 8 at SQL statement
@@ -2949,7 +2949,7 @@ begin
29492949
end;
29502950
$$;
29512951
NOTICE: ok
2952-
ERROR: number of source and target fields in assignment do not match
2952+
ERROR: number of source and target fields in assignment does not match
29532953
DETAIL: strict_multi_assignment check of extra_errors is active.
29542954
HINT: Make sure the query returns the exact list of columns.
29552955
CONTEXT: PL/pgSQL function inline_code_block line 7 at SQL statement
@@ -2960,7 +2960,7 @@ begin
29602960
select 1 into t; -- should fail;
29612961
end;
29622962
$$;
2963-
ERROR: number of source and target fields in assignment do not match
2963+
ERROR: number of source and target fields in assignment does not match
29642964
DETAIL: strict_multi_assignment check of extra_errors is active.
29652965
HINT: Make sure the query returns the exact list of columns.
29662966
CONTEXT: PL/pgSQL function inline_code_block line 5 at SQL statement

0 commit comments

Comments
 (0)