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:06:41 -0400 |
| commit | c68040da6e824f742d0fd973a65a4cef0d3a51f8 (patch) | |
| tree | 49f4b0a5e32219a0b8d96b685d00d49989228e86 | |
| parent | 0b7af46e5dbf646e2378ce1e33df78a4ee6d6c83 (diff) | |
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.
| -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 da218cda497..00247b19c80 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -801,7 +801,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary) } } - pset.lineno++; + if (copystream == pset.cur_cmd_source) + pset.lineno++; } } |