Fix tracking of psql script line numbers during \copy from another place.

Commit 08146775acd8bfe0fcc509c71857abb928697171 changed do_copy() to
temporarily scribble on pset.cur_cmd_source.  That was a mighty ugly bit of
code in any case, but in particular it broke handleCopyIn's ability to tell
whether it was reading from the current script source file (in which case
pset.lineno should be incremented for each line of COPY data), or from
someplace else (in which case it shouldn't).  The former case still worked,
the latter not so much.  The visible effect was that line numbers reported
for errors in a script file would be wrong if there were an earlier \copy
that was reading anything other than inline-in-the-script-file data.

To fix, introduce another pset field that holds the file do_copy wants the
COPY code to use.  This is a little bit ugly, but less so than passing the
file down explicitly through several layers that aren't COPY-specific.

Extracted from a larger patch by Kumar Rajeev Rastogi; that patch also
changes printing of COPY command tags, which is not a bug fix and shouldn't
get back-patched.  This particular idea was from a suggestion by Amit
Khandekar, if I'm reading the thread correctly.

Back-patch to 9.2 where the faulty code was introduced.

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 3dea92c7d8f3bb6868754746f7cc1290713ca885..a2d1d8b1fc5d87a170638a1d4f321598c3a75bb6 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -630,7 +630,7 @@ StoreQueryTuple(const PGresult *result)
  * command.  In that event, we'll marshal data for the COPY and then cycle
  * through any subsequent PGresult objects.
  *
- * When the command string contained no affected COPY command, this function
+ * When the command string contained no such COPY command, this function
  * degenerates to an AcceptResult() call.
  *
  * Changes its argument to point to the last PGresult of the command string,
@@ -690,13 +690,28 @@ ProcessResult(PGresult **results)
             * Marshal the COPY data.  Either subroutine will get the
             * connection out of its COPY state, then call PQresultStatus()
             * once and report any error.
+            *
+            * If pset.copyStream is set, use that as data source/sink,
+            * otherwise use queryFout or cur_cmd_source as appropriate.
             */
+           FILE       *copystream = pset.copyStream;
+
            SetCancelConn();
            if (result_status == PGRES_COPY_OUT)
-               success = handleCopyOut(pset.db, pset.queryFout) && success;
+           {
+               if (!copystream)
+                   copystream = pset.queryFout;
+               success = handleCopyOut(pset.db,
+                                       copystream) && success;
+           }
            else
-               success = handleCopyIn(pset.db, pset.cur_cmd_source,
+           {
+               if (!copystream)
+                   copystream = pset.cur_cmd_source;
+               success = handleCopyIn(pset.db,
+                                      copystream,
                                       PQbinaryTuples(*results)) && success;
+           }
            ResetCancelConn();
 
            /*

diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 3300fd15f7145d22b7751406058837aaf8512fc7..69417a88244129d6fa0e3d0293b6956a19401efe 100644 (file)
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -271,11 +271,8 @@ do_copy(const char *args)
 {
    PQExpBufferData query;
    FILE       *copystream;
-   FILE       *save_file;
-   FILE      **override_file;
    struct copy_options *options;
    bool        success;
-   struct stat st;
 
    /* parse options */
    options = parse_slash_copy(args);
@@ -289,8 +286,6 @@ do_copy(const char *args)
 
    if (options->from)
    {
-       override_file = &pset.cur_cmd_source;
-
        if (options->file)
        {
            if (options->program)
@@ -310,8 +305,6 @@ do_copy(const char *args)
    }
    else
    {
-       override_file = &pset.queryFout;
-
        if (options->file)
        {
            if (options->program)
@@ -347,6 +340,8 @@ do_copy(const char *args)
 
    if (!options->program)
    {
+       struct stat st;
+
        /* make sure the specified file is not a directory */
        fstat(fileno(copystream), &st);
        if (S_ISDIR(st.st_mode))
@@ -370,11 +365,10 @@ do_copy(const char *args)
    if (options->after_tofrom)
        appendPQExpBufferStr(&query, options->after_tofrom);
 
-   /* Run it like a user command, interposing the data source or sink. */
-   save_file = *override_file;
-   *override_file = copystream;
+   /* run it like a user command, but with copystream as data source/sink */
+   pset.copyStream = copystream;
    success = SendQuery(query.data);
-   *override_file = save_file;
+   pset.copyStream = NULL;
    termPQExpBuffer(&query);
 
    if (options->file != NULL)

diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index e78aa9a49997a2a11bb365e0dcbe54995f51e41b..a302250f8e1b4e08ab9a32487a9a6851875ddf98 100644 (file)
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -70,6 +70,8 @@ typedef struct _psqlSettings
    FILE       *queryFout;      /* where to send the query results */
    bool        queryFoutPipe;  /* queryFout is from a popen() */
 
+   FILE       *copyStream;     /* Stream to read/write for \copy command */
+
    printQueryOpt popt;
 
    char       *gfname;         /* one-shot file output argument for \g */

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 1c9f7a568a1574dd9318015bf9fc02b7b2a0012e..f457c614524970503471a6185a2c7af4b9696125 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -120,6 +120,7 @@ main(int argc, char *argv[])
    pset.encoding = PQenv2encoding();
    pset.queryFout = stdout;
    pset.queryFoutPipe = false;
+   pset.copyStream = NULL;
    pset.cur_cmd_source = stdin;
    pset.cur_cmd_interactive = false;