Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cab19af

Browse files
committed
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.
1 parent cd34647 commit cab19af

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/bin/psql/copy.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
586586
}
587587
}
588588

589-
pset.lineno++;
589+
if (copystream == pset.cur_cmd_source)
590+
pset.lineno++;
590591
}
591592
}
592593

0 commit comments

Comments
 (0)