postgres.git / summary / log / commit / refs
commit 9c4c22fdfeab86a65fdba9d2fe63879c034001ae
Author: Peter Eisentraut <peter@eisentraut.org>
Date: Thu Aug 18 09:33:53 2022 +0000
First released in: 16.0, 15.0
Simplify and clarify an error message
src/backend/commands/copyfromparse.c | 2 +-
src/test/regress/expected/copy.out | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c
index 57813b3458b..7cf3e865cfe 100644
--- a/src/backend/commands/copyfromparse.c
+++ b/src/backend/commands/copyfromparse.c
@@ -782,7 +782,7 @@ NextCopyFromRawFields(CopyFromState cstate, char ***fields, int *nfields)
if (fldct != list_length(cstate->attnumlist))
ereport(ERROR,
(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("wrong number of fields in header line: field count is %d, expected %d",
+ errmsg("wrong number of fields in header line: got %d, expected %d",
fldct, list_length(cstate->attnumlist))));
fldnum = 0;
diff --git a/src/test/regress/expected/copy.out b/src/test/regress/expected/copy.out
index 7f2f4ae4aea..3fad1c52d1f 100644
--- a/src/test/regress/expected/copy.out
+++ b/src/test/regress/expected/copy.out
@@ -201,10 +201,10 @@ copy header_copytest from stdin with (header match);
ERROR: column name mismatch in header line field 3: got null value ("\N"), expected "c"
CONTEXT: COPY header_copytest, line 1: "a b \N"
copy header_copytest from stdin with (header match);
-ERROR: wrong number of fields in header line: field count is 2, expected 3
+ERROR: wrong number of fields in header line: got 2, expected 3
CONTEXT: COPY header_copytest, line 1: "a b"
copy header_copytest from stdin with (header match);
-ERROR: wrong number of fields in header line: field count is 4, expected 3
+ERROR: wrong number of fields in header line: got 4, expected 3
CONTEXT: COPY header_copytest, line 1: "a b c d"
copy header_copytest from stdin with (header match);
ERROR: column name mismatch in header line field 3: got "d", expected "c"
@@ -224,10 +224,10 @@ copy header_copytest (c, a) from stdin with (header match);
copy header_copytest (a, c) from stdin with (header match);
-- errors
copy header_copytest from stdin with (header match);
-ERROR: wrong number of fields in header line: field count is 3, expected 2
+ERROR: wrong number of fields in header line: got 3, expected 2
CONTEXT: COPY header_copytest, line 1: "a ........pg.dropped.2........ c"
copy header_copytest (a, c) from stdin with (header match);
-ERROR: wrong number of fields in header line: field count is 3, expected 2
+ERROR: wrong number of fields in header line: got 3, expected 2
CONTEXT: COPY header_copytest, line 1: "a c b"
SELECT * FROM header_copytest ORDER BY a;
a | c
[parent: 7cadaac5130e]