Simplify and clarify an error message

Author: petere

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;

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