diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-05 12:04:40 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-05 12:07:03 -0400 |
| commit | 71a436847bad3d80b0f7577f3439883c2ad2f99a (patch) | |
| tree | 8d2fd6453731fe1e1138febf27c164da59c31250 /src | |
| parent | 41fd96928968c4e7ccececb3a3e013f2521bb6cd (diff) | |
| download | postgresql-71a436847bad3d80b0f7577f3439883c2ad2f99a.tar.gz | |
Fix psql's counting of script file line numbers during COPY.
handleCopyIn incremented pset.lineno for each line of COPY data read from
a 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 if
the data is coming from some other file. Per bug #6083 from Steve Haslam.
Back-patch to all supported versions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/copy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c index e610899a61..2adb40f755 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -841,7 +841,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary) } } - pset.lineno++; + if (copystream == pset.cur_cmd_source) + pset.lineno++; } } |