Try to defend against the possibility that libpq is still in COPY_IN state

when we reach the post-COPY "pump it dry" error recovery code that was added
2006-11-24.  Per a report from Neil Best, there is at least one code path
in which this occurs, leading to an infinite loop in code that's supposed
to be making it more robust not less so.  A reasonable response seems to be
to call PQputCopyEnd() again, so let's try that.

Back-patch to all versions that contain the cleanup loop.

diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 57593d111c11f1462b5a0f3571a104c980efc1f9..7207bb3e02d0d37e52f3fd5c91a20d32e859f1c5 100644 (file)
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.80 2009/04/26 15:31:50 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.80.2.1 2009/08/07 20:16:16 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "copy.h"
@@ -571,6 +571,9 @@ do_copy(const char *args)
                success = false;
                psql_error("\\copy: unexpected response (%d)\n",
                                   PQresultStatus(result));
+               /* if still in COPY IN state, try to get out of it */
+               if (PQresultStatus(result) == PGRES_COPY_IN)
+                       PQputCopyEnd(pset.db, _("trying to exit copy mode"));
                PQclear(result);
        }