From 7a9e70d1e0a98fbd88099f607223471f8a773f0f Mon Sep 17 00:00:00 2001 From: Baptiste Fontaine Date: Fri, 14 Oct 2022 16:44:43 +0000 Subject: [PATCH] Fix some bad rows.Err() handlings in tests --- conn_test.go | 2 +- helper_test.go | 2 +- query_test.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conn_test.go b/conn_test.go index b84093f4..90382519 100644 --- a/conn_test.go +++ b/conn_test.go @@ -575,7 +575,7 @@ func TestListenNotifyWhileBusyIsSafe(t *testing.T) { } if rows.Err() != nil { - t.Errorf("conn.Query failed: %v", err) + t.Errorf("conn.Query failed: %v", rows.Err()) return } diff --git a/helper_test.go b/helper_test.go index 26e54621..c5b65076 100644 --- a/helper_test.go +++ b/helper_test.go @@ -79,7 +79,7 @@ func ensureConnValid(t testing.TB, conn *pgx.Conn) { } if rows.Err() != nil { - t.Fatalf("conn.Query failed: %v", err) + t.Fatalf("conn.Query failed: %v", rows.Err()) } if rowCount != 10 { diff --git a/query_test.go b/query_test.go index b2aa5d10..c00cdec2 100644 --- a/query_test.go +++ b/query_test.go @@ -42,7 +42,7 @@ func TestConnQueryScan(t *testing.T) { } if rows.Err() != nil { - t.Fatalf("conn.Query failed: %v", err) + t.Fatalf("conn.Query failed: %v", rows.Err()) } assert.Equal(t, "SELECT 10", rows.CommandTag().String()) @@ -126,7 +126,7 @@ func TestConnQueryScanWithManyColumns(t *testing.T) { } if rows.Err() != nil { - t.Fatalf("conn.Query failed: %v", err) + t.Fatalf("conn.Query failed: %v", rows.Err()) } if rowCount != 5 { @@ -162,7 +162,7 @@ func TestConnQueryValues(t *testing.T) { } if rows.Err() != nil { - t.Fatalf("conn.Query failed: %v", err) + t.Fatalf("conn.Query failed: %v", rows.Err()) } if rowCount != 10 { @@ -1988,7 +1988,7 @@ insert into products (name, price) values // The first error encountered by the original Query call, rows.Next or rows.Scan will be returned here. if rows.Err() != nil { - fmt.Printf("rows error: %v", err) + fmt.Printf("rows error: %v", rows.Err()) return }