From 305c4ddbc7b8ee547f0fe565c193f1a53c90ffe6 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Sat, 1 Oct 2022 10:09:57 -0500
Subject: [PATCH] Move and rename test

---
 pgconn/pgconn_test.go | 89 ++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/pgconn/pgconn_test.go b/pgconn/pgconn_test.go
index 55fd6012..79a8d9a2 100644
--- a/pgconn/pgconn_test.go
+++ b/pgconn/pgconn_test.go
@@ -1858,6 +1858,51 @@ func TestConnCopyFromNoticeResponseReceivedMidStream(t *testing.T) {
 	require.NoError(t, err)
 }
 
+type delayedReader struct {
+	r io.Reader
+}
+
+func (d delayedReader) Read(p []byte) (int, error) {
+	// W/o sleep test passes, with sleep it fails.
+	time.Sleep(time.Millisecond)
+	return d.r.Read(p)
+}
+
+// https://github.com/jackc/pgconn/issues/128
+func TestConnCopyFromDataWriteAfterErrorAndReturn(t *testing.T) {
+	connString := os.Getenv("PGX_TEST_CONN_STRING")
+	if connString == "" {
+		t.Skipf("Skipping due to missing environment variable %v", "PGX_TEST_CONN_STRING")
+	}
+
+	config, err := pgconn.ParseConfig(connString)
+	require.NoError(t, err)
+
+	pgConn, err := pgconn.ConnectConfig(context.Background(), config)
+	require.NoError(t, err)
+
+	if pgConn.ParameterStatus("crdb_version") != "" {
+		t.Skip("Server does support COPY FROM")
+	}
+
+	setupSQL := `create temporary table t (
+		id text primary key,
+		n int not null
+	);`
+
+	_, err = pgConn.Exec(context.Background(), setupSQL).ReadAll()
+	assert.NoError(t, err)
+
+	r1 := delayedReader{r: strings.NewReader(`id	0\n`)}
+	// Generate an error with a bogus COPY command
+	_, err = pgConn.CopyFrom(context.Background(), r1, "COPY nosuchtable FROM STDIN ")
+	assert.Error(t, err)
+
+	r2 := delayedReader{r: strings.NewReader(`id	0\n`)}
+	_, err = pgConn.CopyFrom(context.Background(), r2, "COPY t FROM STDIN")
+	assert.NoError(t, err)
+}
+
 func TestConnEscapeString(t *testing.T) {
 	t.Parallel()
 
@@ -2814,47 +2859,3 @@ func TestSNISupport(t *testing.T) {
 		})
 	}
 }
-
-type delayedReader struct {
-	r io.Reader
-}
-
-func (d delayedReader) Read(p []byte) (int, error) {
-	// W/o sleep test passes, with sleep it fails.
-	time.Sleep(time.Millisecond)
-	return d.r.Read(p)
-}
-
-func TestCopyFrom(t *testing.T) {
-	connString := os.Getenv("PGX_TEST_CONN_STRING")
-	if connString == "" {
-		t.Skipf("Skipping due to missing environment variable %v", "PGX_TEST_CONN_STRING")
-	}
-
-	config, err := pgconn.ParseConfig(connString)
-	require.NoError(t, err)
-
-	pgConn, err := pgconn.ConnectConfig(context.Background(), config)
-	require.NoError(t, err)
-
-	if pgConn.ParameterStatus("crdb_version") != "" {
-		t.Skip("Server does support COPY FROM")
-	}
-
-	setupSQL := `create temporary table t (
-		id text primary key,
-		n int not null
-	);`
-
-	_, err = pgConn.Exec(context.Background(), setupSQL).ReadAll()
-	assert.NoError(t, err)
-
-	r1 := delayedReader{r: strings.NewReader(`id	0\n`)}
-	// Generate an error with a bogus COPY command
-	_, err = pgConn.CopyFrom(context.Background(), r1, "COPY nosuchtable FROM STDIN ")
-	assert.Error(t, err)
-
-	r2 := delayedReader{r: strings.NewReader(`id	0\n`)}
-	_, err = pgConn.CopyFrom(context.Background(), r2, "COPY t FROM STDIN")
-	assert.NoError(t, err)
-}