Fix psql's counting of script file line numbers during COPY.

tglsfdc · tglsfdc · commit 245b5f1794ef · 2011-07-05T12:05:35.000-04:00
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
@@ -586,7 +586,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
 				}
 			}
 
-			pset.lineno++;
+			if (copystream == pset.cur_cmd_source)
+				pset.lineno++;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,8 @@ handleCopyIn(PGconn conn, FILE copystream, bool isbinary)`
`586`	`586`	`}`
`587`	`587`	`}`
`588`	`588`
`589`		`- pset.lineno++;`
	`589`	`+ if (copystream == pset.cur_cmd_source)`
	`590`	`+ pset.lineno++;`
`590`	`591`	`}`
`591`	`592`	`}`
`592`	`593`