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:00 -0400 |
| commit | 966e87d6a8543094c10f5c83899b188aa7b0619c (patch) | |
| tree | 15452e46459644607aed0aefb9d35d4c570de666 /src | |
| parent | ed70eaca971c5e30b99ab1e596bce7db3c3fc44f (diff) | |
| download | postgresql-966e87d6a8543094c10f5c83899b188aa7b0619c.tar.gz postgresql-966e87d6a8543094c10f5c83899b188aa7b0619c.zip | |
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 824ccc30b9e..6d291099b1f 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -809,7 +809,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary) } } - pset.lineno++; + if (copystream == pset.cur_cmd_source) + pset.lineno++; } } |