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.
This commit is contained in:
Tom Lane 2011-07-05 12:04:40 -04:00
parent cd34647c66
commit cab19af9fb

View File

@ -586,7 +586,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
}
}
pset.lineno++;
if (copystream == pset.cur_cmd_source)
pset.lineno++;
}
}