Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
02daece4
Commit
02daece4
authored
May 09, 2019
by
Peter Eisentraut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix grammar in error message
parent
2d7d946c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
doc/src/sgml/plpgsql.sgml
doc/src/sgml/plpgsql.sgml
+2
-2
src/pl/plpgsql/src/pl_exec.c
src/pl/plpgsql/src/pl_exec.c
+4
-4
src/test/regress/expected/plpgsql.out
src/test/regress/expected/plpgsql.out
+6
-6
No files found.
doc/src/sgml/plpgsql.sgml
View file @
02daece4
...
@@ -5165,10 +5165,10 @@ END;
...
@@ -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 do
es
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 do
es
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.
...
...
src/pl/plpgsql/src/pl_exec.c
View file @
02daece4
...
@@ -6993,7 +6993,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
...
@@ -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 do
es
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,
...
@@ -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 do
es
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,
...
@@ -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 do
es
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,
...
@@ -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 do
es
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"
,
...
...
src/test/regress/expected/plpgsql.out
View file @
02daece4
...
@@ -2899,10 +2899,10 @@ begin
...
@@ -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 do
es
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 do
es
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
...
@@ -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 do
es
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
...
@@ -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 do
es
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
...
@@ -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 do
es
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
...
@@ -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 do
es
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment