GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial pass at fixing pgtype tests 

Many still failing, but at least it compiles now.
non-blocking
Jack Christensen 2019-04-12 16:58:42 -05:00
parent 0ac82007fb
commit fcbd9e93fa
6 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
enum_array_test.go
View File

@ -1,6 +1,7 @@
package pgtype_test
import (
"context"
"reflect"
"testing"
@ -10,12 +11,12 @@ import (
func TestEnumArrayTranscode(t *testing.T) {
setupConn := testutil.MustConnectPgx(t)
defer testutil.MustClose(t, setupConn)
defer testutil.MustCloseContext(t, setupConn)
if _, err := setupConn.Exec("drop type if exists color"); err != nil {
if _, err := setupConn.Exec(context.Background(), "drop type if exists color"); err != nil {
t.Fatal(err)
}
if _, err := setupConn.Exec("create type color as enum ('red', 'green', 'blue')"); err != nil {
if _, err := setupConn.Exec(context.Background(), "create type color as enum ('red', 'green', 'blue')"); err != nil {
t.Fatal(err)
}

5
hstore_array_test.go
View File

@ -1,6 +1,7 @@
package pgtype_test
import (
"context"
"reflect"
"testing"
@ -11,7 +12,7 @@ import (
func TestHstoreArrayTranscode(t *testing.T) {
conn := testutil.MustConnectPgx(t)
defer testutil.MustClose(t, conn)
defer testutil.MustCloseContext(t, conn)
text := func(s string) pgtype.Text {
return pgtype.Text{String: s, Status: pgtype.Present}
@ -77,7 +78,7 @@ func TestHstoreArrayTranscode(t *testing.T) {
}
var result pgtype.HstoreArray
err := conn.QueryRow("test", vEncoder).Scan(&result)
err := conn.QueryRow(context.Background(), "test", vEncoder).Scan(&result)
if err != nil {
t.Errorf("%v: %v", fc.name, err)
continue

2
jsonb_test.go
View File

@ -11,7 +11,7 @@ import (
func TestJSONBTranscode(t *testing.T) {
conn := testutil.MustConnectPgx(t)
defer testutil.MustClose(t, conn)
defer testutil.MustCloseContext(t, conn)
if _, ok := conn.ConnInfo.DataTypeForName("jsonb"); !ok {
t.Skip("Skipping due to no jsonb type")
}

3
line_test.go
View File

@ -1,6 +1,7 @@
package pgtype_test
import (
"context"
"testing"
"github.com/jackc/pgx/pgtype"
@ -15,7 +16,7 @@ func TestLineTranscode(t *testing.T) {
// line may exist but not be usable on 9.3 :(
var isPG93 bool
err := conn.QueryRow("select version() ~ '9.3'").Scan(&isPG93)
err := conn.QueryRow(context.Background(), "select version() ~ '9.3'").Scan(&isPG93)
if err != nil {
t.Fatal(err)
}

13
record_test.go
View File

@ -1,6 +1,7 @@
package pgtype_test
import (
"context"
"fmt"
"reflect"
"testing"
@ -12,7 +13,7 @@ import (
func TestRecordTranscode(t *testing.T) {
conn := testutil.MustConnectPgx(t)
defer testutil.MustClose(t, conn)
defer testutil.MustCloseContext(t, conn)
tests := []struct {
sql string
@ -91,7 +92,7 @@ func TestRecordTranscode(t *testing.T) {
ps.FieldDescriptions[0].FormatCode = pgx.BinaryFormatCode
var result pgtype.Record
if err := conn.QueryRow(psName).Scan(&result); err != nil {
if err := conn.QueryRow(context.Background(), psName).Scan(&result); err != nil {
t.Errorf("%d: %v", i, err)
continue
}
@ -104,9 +105,9 @@ func TestRecordTranscode(t *testing.T) {
func TestRecordWithUnknownOID(t *testing.T) {
conn := testutil.MustConnectPgx(t)
defer testutil.MustClose(t, conn)
defer testutil.MustCloseContext(t, conn)
_, err := conn.Exec(`drop type if exists floatrange;
_, err := conn.Exec(context.Background(), `drop type if exists floatrange;
create type floatrange as range (
subtype = float8,
@ -115,10 +116,10 @@ create type floatrange as range (
if err != nil {
t.Fatal(err)
}
defer conn.Exec("drop type floatrange")
defer conn.Exec(context.Background(), "drop type floatrange")
var result pgtype.Record
err = conn.QueryRow("select row('foo'::text, floatrange(1, 10), 'bar'::text)").Scan(&result)
err = conn.QueryRow(context.Background(), "select row('foo'::text, floatrange(1, 10), 'bar'::text)").Scan(&result)
if err == nil {
t.Errorf("expected error but none")
}

28
testutil/testutil.go
View File

@ -34,12 +34,7 @@ func MustConnectDatabaseSQL(t testing.TB, driverName string) *sql.DB {
}
func MustConnectPgx(t testing.TB) *pgx.Conn {
config, err := pgx.ParseConnectionString(os.Getenv("PGX_TEST_DATABASE"))
if err != nil {
t.Fatal(err)
}
conn, err := pgx.Connect(config)
conn, err := pgx.Connect(context.Background(), os.Getenv("PGX_TEST_DATABASE"))
if err != nil {
t.Fatal(err)
}
@ -56,6 +51,15 @@ func MustClose(t testing.TB, conn interface {
}
}
func MustCloseContext(t testing.TB, conn interface {
Close(context.Context) error
}) {
err := conn.Close(context.Background())
if err != nil {
t.Fatal(err)
}
}
type forceTextEncoder struct {
e pgtype.TextEncoder
}
@ -102,7 +106,7 @@ func TestSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName string, values []int
func TestPgxSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName string, values []interface{}, eqFunc func(a, b interface{}) bool) {
conn := MustConnectPgx(t)
defer MustClose(t, conn)
defer MustCloseContext(t, conn)
ps, err := conn.Prepare("test", fmt.Sprintf("select $1::%s", pgTypeName))
if err != nil {
@ -133,7 +137,7 @@ func TestPgxSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName string, values []
}
result := reflect.New(reflect.TypeOf(derefV))
err := conn.QueryRow("test", ForceEncoder(v, fc.formatCode)).Scan(result.Interface())
err := conn.QueryRow(context.Background(), "test", ForceEncoder(v, fc.formatCode)).Scan(result.Interface())
if err != nil {
t.Errorf("%v %d: %v", fc.name, i, err)
}
@ -147,7 +151,7 @@ func TestPgxSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName string, values []
func TestPgxSimpleProtocolSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName string, values []interface{}, eqFunc func(a, b interface{}) bool) {
conn := MustConnectPgx(t)
defer MustClose(t, conn)
defer MustCloseContext(t, conn)
for i, v := range values {
// Derefence value if it is a pointer
@ -158,7 +162,7 @@ func TestPgxSimpleProtocolSuccessfulTranscodeEqFunc(t testing.TB, pgTypeName str
}
result := reflect.New(reflect.TypeOf(derefV))
err := conn.QueryRowEx(
err := conn.QueryRow(
context.Background(),
fmt.Sprintf("select ($1)::%s", pgTypeName),
&pgx.QueryExOptions{SimpleProtocol: true},
@ -223,7 +227,7 @@ func TestSuccessfulNormalizeEqFunc(t testing.TB, tests []NormalizeTest, eqFunc f
func TestPgxSuccessfulNormalizeEqFunc(t testing.TB, tests []NormalizeTest, eqFunc func(a, b interface{}) bool) {
conn := MustConnectPgx(t)
defer MustClose(t, conn)
defer MustCloseContext(t, conn)
formats := []struct {
name string
@ -254,7 +258,7 @@ func TestPgxSuccessfulNormalizeEqFunc(t testing.TB, tests []NormalizeTest, eqFun
}
result := reflect.New(reflect.TypeOf(derefV))
err = conn.QueryRow(psName).Scan(result.Interface())
err = conn.QueryRow(context.Background(), psName).Scan(result.Interface())
if err != nil {
t.Errorf("%v %d: %v", fc.name, i, err)
}