From ef2b70edadd1ad7366e12c10e55da40f6bb40286 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Sat, 11 Dec 2021 14:37:02 -0600
Subject: [PATCH] Remove github.com/gofrs/uuid test dependency
---
go.mod | 1 -
go.sum | 2 --
query_test.go | 19 +++++--------------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/go.mod b/go.mod
index a540c5f5..b9ae1f8e 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,6 @@ go 1.17
require (
github.com/go-kit/log v0.1.0
- github.com/gofrs/uuid v4.0.0+incompatible
github.com/jackc/chunkreader/v2 v2.0.1
github.com/jackc/pgio v1.0.0
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65
diff --git a/go.sum b/go.sum
index 0ac9ca50..9fe60dde 100644
--- a/go.sum
+++ b/go.sum
@@ -13,8 +13,6 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
-github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
diff --git a/query_test.go b/query_test.go
index 63040894..e725bd40 100644
--- a/query_test.go
+++ b/query_test.go
@@ -13,7 +13,6 @@ import (
"testing"
"time"
- "github.com/gofrs/uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
"github.com/jackc/pgx/v5/pgconn/stmtcache"
@@ -1215,20 +1214,12 @@ func TestConnQueryDatabaseSQLDriverValuerWithBinaryPgTypeThatAcceptsSameType(t *
conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, conn)
- expected, err := uuid.FromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
- if err != nil {
- t.Fatal(err)
- }
+ var actual sql.NullString
+ err := conn.QueryRow(context.Background(), "select '6ba7b810-9dad-11d1-80b4-00c04fd430c8'::uuid").Scan(&actual)
+ require.NoError(t, err)
- var u2 uuid.UUID
- err = conn.QueryRow(context.Background(), "select $1::uuid", expected).Scan(&u2)
- if err != nil {
- t.Fatalf("Scan failed: %v", err)
- }
-
- if expected != u2 {
- t.Errorf("Expected u2 to be %v, but it was %v", expected, u2)
- }
+ require.True(t, actual.Valid)
+ require.Equal(t, "6ba7b810-9dad-11d1-80b4-00c04fd430c8", actual.String)
ensureConnValid(t, conn)
}