From: Tom Lane <tgl@sss.pgh.pa.us>
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_2_22~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71a436847bad3d80b0f7577f3439883c2ad2f99a;p=thirdparty%2Fpostgresql.git

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 e610899a61b..2adb40f7555 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++;
 		}
 	}