From: Tom Lane Date: Tue, 5 Jul 2011 16:04:40 +0000 (-0400) Subject: Fix psql's counting of script file line numbers during COPY. X-Git-Tag: REL8_3_16~32 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c68040da6e824f742d0fd973a65a4cef0d3a51f8;p=postgresql 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. --- diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c index da218cda49..00247b19c8 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++; } }