NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit08909e3

committed

Simplify and clarify an error message

1 parentf340f97 commit08909e3Copy full SHA for 08909e3

File tree

2 files changed

-5

lines changed

src
- backend/commands
  - copyfromparse.c
- test/regress/expected
  - copy.out

2 files changed

-5

lines changed

`‎src/backend/commands/copyfromparse.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ NextCopyFromRawFields(CopyFromState cstate, char **fields, int nfields)`
`782`	`782`	`if (fldct!=list_length(cstate->attnumlist))`
`783`	`783`	`ereport(ERROR,`
`784`	`784`	`(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),`
`785`		`-errmsg("wrong number of fields in header line:field count is %d, expected %d",`
	`785`	`+errmsg("wrong number of fields in header line:got %d, expected %d",`
`786`	`786`	`fldct,list_length(cstate->attnumlist))));`
`787`	`787`
`788`	`788`	`fldnum=0;`

`‎src/test/regress/expected/copy.out`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,10 @@ copy header_copytest from stdin with (header match);`
`201`	`201`	`ERROR: column name mismatch in header line field 3: got null value ("\N"), expected "c"`
`202`	`202`	`CONTEXT: COPY header_copytest, line 1: "ab\N"`
`203`	`203`	`copy header_copytest from stdin with (header match);`
`204`		`-ERROR: wrong number of fields in header line:field count is 2, expected 3`
	`204`	`+ERROR: wrong number of fields in header line:got 2, expected 3`
`205`	`205`	`CONTEXT: COPY header_copytest, line 1: "ab"`
`206`	`206`	`copy header_copytest from stdin with (header match);`
`207`		`-ERROR: wrong number of fields in header line:field count is 4, expected 3`
	`207`	`+ERROR: wrong number of fields in header line:got 4, expected 3`
`208`	`208`	`CONTEXT: COPY header_copytest, line 1: "abcd"`
`209`	`209`	`copy header_copytest from stdin with (header match);`
`210`	`210`	`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);`
`224`	`224`	`copy header_copytest (a, c) from stdin with (header match);`
`225`	`225`	`-- errors`
`226`	`226`	`copy header_copytest from stdin with (header match);`
`227`		`-ERROR: wrong number of fields in header line:field count is 3, expected 2`
	`227`	`+ERROR: wrong number of fields in header line:got 3, expected 2`
`228`	`228`	`CONTEXT: COPY header_copytest, line 1: "a........pg.dropped.2........c"`
`229`	`229`	`copy header_copytest (a, c) from stdin with (header match);`
`230`		`-ERROR: wrong number of fields in header line:field count is 3, expected 2`
	`230`	`+ERROR: wrong number of fields in header line:got 3, expected 2`
`231`	`231`	`CONTEXT: COPY header_copytest, line 1: "acb"`
`232`	`232`	`SELECT * FROM header_copytest ORDER BY a;`
`233`	`233`	`a \| c`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit08909e3

File tree

2 files changed

2 files changed

`‎src/backend/commands/copyfromparse.c`

`‎src/test/regress/expected/copy.out`

0 commit comments