Simplify and clarify an error message

diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c
index 57813b3458b5b112d2c0b5cd56c1668c01e9dc1c..7cf3e865cfe25f48c277d70e7ed53292df05dffe 100644 (file)
--- 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 7f2f4ae4aea6179b216a0146f5f033fb69ac727b..3fad1c52d1fe53c516b2e52d251737510503fda6 100644 (file)
--- 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