NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit245b5f1

committed

Fix psql's counting of script file line numbers during COPY.

handleCopyIn incremented pset.lineno for each line of COPY data read froma file. This is correct when reading from the current script file (i.e.,we are doing COPY FROM STDIN followed by in-line data), but it's wrong ifthe data is coming from some other file. Per bug #6083 from Steve Haslam.Back-patch to all supported versions.

1 parent1e7b52d commit245b5f1Copy full SHA for 245b5f1

File tree

1 file changed

-1

lines changed

src/bin/psql
- copy.c

1 file changed

-1

lines changed

`‎src/bin/psql/copy.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,8 @@ handleCopyIn(PGconn conn, FILE copystream, bool isbinary)`
`586`	`586`	`}`
`587`	`587`	`}`
`588`	`588`
`589`		`-pset.lineno++;`
	`589`	`+if (copystream==pset.cur_cmd_source)`
	`590`	`+pset.lineno++;`
`590`	`591`	`}`
`591`	`592`	`}`
`592`	`593`

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!

Commit245b5f1

File tree

1 file changed

1 file changed

`‎src/bin/psql/copy.c`

0 commit comments