Improve simple protocol / text format

Increased data type support for simple protocol. Improved test
coverage of simple protocol. This has the additional advantage of
exercising the text encoders and decoders.

conn_test.go

@@ -98,11 +98,10 @@ func TestConnectWithPreferSimpleProtocol(t *testing.T) {
 }
 
 func TestConnectConfigRequiresConnConfigFromParseConfig(t *testing.T) {
-	t.Parallel()
-
 	config := &pgx.ConnConfig{}
-
+	require.PanicsWithValue(t, "config must be created by ParseConfig", func() {
-	require.PanicsWithValue(t, "config must be created by ParseConfig", func() { pgx.ConnectConfig(context.Background(), config) })
+		pgx.ConnectConfig(context.Background(), config)
+	})
 }
 
 func TestParseConfigExtractsStatementCacheOptions(t *testing.T) {
@@ -140,131 +139,121 @@ func TestParseConfigExtractsStatementCacheOptions(t *testing.T) {
 func TestExec(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		if results := mustExec(t, conn, "create temporary table foo(id integer primary key);"); string(results) != "CREATE TABLE" {
+			t.Error("Unexpected results from Exec")
+		}
 
-	if results := mustExec(t, conn, "create temporary table foo(id integer primary key);"); string(results) != "CREATE TABLE" {
+		// Accept parameters
-		t.Error("Unexpected results from Exec")
+		if results := mustExec(t, conn, "insert into foo(id) values($1)", 1); string(results) != "INSERT 0 1" {
-	}
+			t.Errorf("Unexpected results from Exec: %v", results)
+		}
 
-	// Accept parameters
+		if results := mustExec(t, conn, "drop table foo;"); string(results) != "DROP TABLE" {
-	if results := mustExec(t, conn, "insert into foo(id) values($1)", 1); string(results) != "INSERT 0 1" {
+			t.Error("Unexpected results from Exec")
-		t.Errorf("Unexpected results from Exec: %v", results)
+		}
-	}
 
-	if results := mustExec(t, conn, "drop table foo;"); string(results) != "DROP TABLE" {
+		// Multiple statements can be executed -- last command tag is returned
-		t.Error("Unexpected results from Exec")
+		if results := mustExec(t, conn, "create temporary table foo(id serial primary key); drop table foo;"); string(results) != "DROP TABLE" {
-	}
+			t.Error("Unexpected results from Exec")
+		}
 
-	// Multiple statements can be executed -- last command tag is returned
+		// Can execute longer SQL strings than sharedBufferSize
-	if results := mustExec(t, conn, "create temporary table foo(id serial primary key); drop table foo;"); string(results) != "DROP TABLE" {
+		if results := mustExec(t, conn, strings.Repeat("select 42; ", 1000)); string(results) != "SELECT 1" {
-		t.Error("Unexpected results from Exec")
+			t.Errorf("Unexpected results from Exec: %v", results)
-	}
+		}
 
-	// Can execute longer SQL strings than sharedBufferSize
+		// Exec no-op which does not return a command tag
-	if results := mustExec(t, conn, strings.Repeat("select 42; ", 1000)); string(results) != "SELECT 1" {
+		if results := mustExec(t, conn, "--;"); string(results) != "" {
-		t.Errorf("Unexpected results from Exec: %v", results)
+			t.Errorf("Unexpected results from Exec: %v", results)
-	}
+		}
-
+	})
-	// Exec no-op which does not return a command tag
-	if results := mustExec(t, conn, "--;"); string(results) != "" {
-		t.Errorf("Unexpected results from Exec: %v", results)
-	}
 }
 
 func TestExecFailure(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		if _, err := conn.Exec(context.Background(), "selct;"); err == nil {
+			t.Fatal("Expected SQL syntax error")
+		}
 
-	if _, err := conn.Exec(context.Background(), "selct;"); err == nil {
+		rows, _ := conn.Query(context.Background(), "select 1")
-		t.Fatal("Expected SQL syntax error")
+		rows.Close()
-	}
+		if rows.Err() != nil {
-
+			t.Fatalf("Exec failure appears to have broken connection: %v", rows.Err())
-	rows, _ := conn.Query(context.Background(), "select 1")
+		}
-	rows.Close()
+	})
-	if rows.Err() != nil {
-		t.Fatalf("Exec failure appears to have broken connection: %v", rows.Err())
-	}
 }
 
 func TestExecFailureWithArguments(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		_, err := conn.Exec(context.Background(), "selct $1;", 1)
+		if err == nil {
+			t.Fatal("Expected SQL syntax error")
+		}
+		assert.False(t, pgconn.SafeToRetry(err))
 
-	_, err := conn.Exec(context.Background(), "selct $1;", 1)
+		_, err = conn.Exec(context.Background(), "select $1::varchar(1);", "1", "2")
-	if err == nil {
+		require.Error(t, err)
-		t.Fatal("Expected SQL syntax error")
+	})
-	}
-	assert.False(t, pgconn.SafeToRetry(err))
-
-	_, err = conn.Exec(context.Background(), "select $1::varchar(1);", "1", "2")
-	if err == nil {
-		t.Fatal("Expected pgx arguments count error", err)
-	}
-	assert.Equal(t, "expected 1 arguments, got 2", err.Error())
 }
 
 func TestExecContextWithoutCancelation(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		defer cancelFunc()
 
-	ctx, cancelFunc := context.WithCancel(context.Background())
+		commandTag, err := conn.Exec(ctx, "create temporary table foo(id integer primary key);")
-	defer cancelFunc()
+		if err != nil {
-
+			t.Fatal(err)
-	commandTag, err := conn.Exec(ctx, "create temporary table foo(id integer primary key);")
+		}
-	if err != nil {
+		if string(commandTag) != "CREATE TABLE" {
-		t.Fatal(err)
+			t.Fatalf("Unexpected results from Exec: %v", commandTag)
-	}
+		}
-	if string(commandTag) != "CREATE TABLE" {
+		assert.False(t, pgconn.SafeToRetry(err))
-		t.Fatalf("Unexpected results from Exec: %v", commandTag)
+	})
-	}
-	assert.False(t, pgconn.SafeToRetry(err))
 }
 
 func TestExecContextFailureWithoutCancelation(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		defer cancelFunc()
 
-	ctx, cancelFunc := context.WithCancel(context.Background())
+		_, err := conn.Exec(ctx, "selct;")
-	defer cancelFunc()
+		if err == nil {
-
+			t.Fatal("Expected SQL syntax error")
-	_, err := conn.Exec(ctx, "selct;")
+		}
-	if err == nil {
+		assert.False(t, pgconn.SafeToRetry(err))
-		t.Fatal("Expected SQL syntax error")
-	}
-	assert.False(t, pgconn.SafeToRetry(err))
-
-	rows, _ := conn.Query(context.Background(), "select 1")
-	rows.Close()
-	if rows.Err() != nil {
-		t.Fatalf("ExecEx failure appears to have broken connection: %v", rows.Err())
-	}
-	assert.False(t, pgconn.SafeToRetry(err))
 
+		rows, _ := conn.Query(context.Background(), "select 1")
+		rows.Close()
+		if rows.Err() != nil {
+			t.Fatalf("ExecEx failure appears to have broken connection: %v", rows.Err())
+		}
+		assert.False(t, pgconn.SafeToRetry(err))
+	})
 }
 
 func TestExecContextFailureWithoutCancelationWithArguments(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		defer cancelFunc()
 
-	ctx, cancelFunc := context.WithCancel(context.Background())
+		_, err := conn.Exec(ctx, "selct $1;", 1)
-	defer cancelFunc()
+		if err == nil {
-
+			t.Fatal("Expected SQL syntax error")
-	_, err := conn.Exec(ctx, "selct $1;", 1)
+		}
-	if err == nil {
+		assert.False(t, pgconn.SafeToRetry(err))
-		t.Fatal("Expected SQL syntax error")
+	})
-	}
-	assert.False(t, pgconn.SafeToRetry(err))
 }
 
 func TestExecFailureCloseBefore(t *testing.T) {
@@ -278,38 +267,6 @@ func TestExecFailureCloseBefore(t *testing.T) {
 	assert.True(t, pgconn.SafeToRetry(err))
 }
 
-func TestExecExtendedProtocol(t *testing.T) {
-	t.Parallel()
-
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
-	defer closeConn(t, conn)
-
-	ctx, cancelFunc := context.WithCancel(context.Background())
-	defer cancelFunc()
-
-	commandTag, err := conn.Exec(ctx, "create temporary table foo(name varchar primary key);")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(commandTag) != "CREATE TABLE" {
-		t.Fatalf("Unexpected results from Exec: %v", commandTag)
-	}
-
-	commandTag, err = conn.Exec(
-		ctx,
-		"insert into foo(name) values($1);",
-		"bar",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(commandTag) != "INSERT 0 1" {
-		t.Fatalf("Unexpected results from ExecEx: %v", commandTag)
-	}
-
-	ensureConnValid(t, conn)
-}
-
 func TestExecStatementCacheModes(t *testing.T) {
 	t.Parallel()
 
@@ -360,7 +317,7 @@ func TestExecStatementCacheModes(t *testing.T) {
 	}
 }
 
-func TestExecSimpleProtocol(t *testing.T) {
+func TestExecPerQuerySimpleProtocol(t *testing.T) {
 	t.Parallel()
 
 	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
@@ -692,33 +649,31 @@ func TestFatalTxError(t *testing.T) {
 func TestInsertBoolArray(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		if results := mustExec(t, conn, "create temporary table foo(spice bool[]);"); string(results) != "CREATE TABLE" {
+			t.Error("Unexpected results from Exec")
+		}
 
-	if results := mustExec(t, conn, "create temporary table foo(spice bool[]);"); string(results) != "CREATE TABLE" {
+		// Accept parameters
-		t.Error("Unexpected results from Exec")
+		if results := mustExec(t, conn, "insert into foo(spice) values($1)", []bool{true, false, true}); string(results) != "INSERT 0 1" {
-	}
+			t.Errorf("Unexpected results from Exec: %v", results)
-
+		}
-	// Accept parameters
+	})
-	if results := mustExec(t, conn, "insert into foo(spice) values($1)", []bool{true, false, true}); string(results) != "INSERT 0 1" {
-		t.Errorf("Unexpected results from Exec: %v", results)
-	}
 }
 
 func TestInsertTimestampArray(t *testing.T) {
 	t.Parallel()
 
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		if results := mustExec(t, conn, "create temporary table foo(spice timestamp[]);"); string(results) != "CREATE TABLE" {
+			t.Error("Unexpected results from Exec")
+		}
 
-	if results := mustExec(t, conn, "create temporary table foo(spice timestamp[]);"); string(results) != "CREATE TABLE" {
+		// Accept parameters
-		t.Error("Unexpected results from Exec")
+		if results := mustExec(t, conn, "insert into foo(spice) values($1)", []time.Time{time.Unix(1419143667, 0), time.Unix(1419143672, 0)}); string(results) != "INSERT 0 1" {
-	}
+			t.Errorf("Unexpected results from Exec: %v", results)
-
+		}
-	// Accept parameters
+	})
-	if results := mustExec(t, conn, "insert into foo(spice) values($1)", []time.Time{time.Unix(1419143667, 0), time.Unix(1419143672, 0)}); string(results) != "INSERT 0 1" {
-		t.Errorf("Unexpected results from Exec: %v", results)
-	}
 }
 
 type testLog struct {
@@ -833,71 +788,61 @@ func TestConnInitConnInfo(t *testing.T) {
 }
 
 func TestUnregisteredTypeUsableAsStringArgumentAndBaseResult(t *testing.T) {
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		var n uint64
+		err := conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n)
+		if err != nil {
+			t.Fatal(err)
+		}
 
-	var n uint64
+		if n != 42 {
-	err := conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n)
+			t.Fatalf("Expected n to be 42, but was %v", n)
-	if err != nil {
+		}
-		t.Fatal(err)
+	})
-	}
-
-	if n != 42 {
-		t.Fatalf("Expected n to be 42, but was %v", n)
-	}
-
-	ensureConnValid(t, conn)
 }
 
 func TestDomainType(t *testing.T) {
-	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	testWithAndWithoutPreferSimpleProtocol(t, func(t *testing.T, conn *pgx.Conn) {
-	defer closeConn(t, conn)
+		var n uint64
 
-	var err error
+		// Domain type uint64 is a PostgreSQL domain of underlying type numeric.
-	var n uint64
 
-	// Domain type uint64 is a PostgreSQL domain of underlying type numeric.
+		err := conn.QueryRow(context.Background(), "select $1::uint64", uint64(24)).Scan(&n)
+		require.NoError(t, err)
 
-	// Since it is not registered, pgx does not know how to encode Go uint64 argument.
+		// A string can be used. But a string cannot be the result because the describe result from the PostgreSQL server gives
-	err = conn.QueryRow(context.Background(), "select $1::uint64", uint64(24)).Scan(&n)
+		// the underlying type of numeric.
-	if err == nil {
+		err = conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n)
-		t.Fatal("expected error encoding uint64 into unregistered domain")
+		if err != nil {
-	}
+			t.Fatal(err)
+		}
+		if n != 42 {
+			t.Fatalf("Expected n to be 42, but was %v", n)
+		}
 
-	// A string can be used. But a string cannot be the result because the describe result from the PostgreSQL server gives
+		var uint64OID uint32
-	// the underlying type of numeric.
+		err = conn.QueryRow(context.Background(), "select t.oid from pg_type t where t.typname='uint64';").Scan(&uint64OID)
-	err = conn.QueryRow(context.Background(), "select $1::uint64", "42").Scan(&n)
+		if err != nil {
-	if err != nil {
+			t.Fatalf("did not find uint64 OID, %v", err)
-		t.Fatal(err)
+		}
-	}
+		conn.ConnInfo().RegisterDataType(pgtype.DataType{Value: &pgtype.Numeric{}, Name: "uint64", OID: uint64OID})
-	if n != 42 {
-		t.Fatalf("Expected n to be 42, but was %v", n)
-	}
 
-	var uint64OID uint32
+		// String is still an acceptable argument after registration
-	err = conn.QueryRow(context.Background(), "select t.oid from pg_type t where t.typname='uint64';").Scan(&uint64OID)
+		err = conn.QueryRow(context.Background(), "select $1::uint64", "7").Scan(&n)
-	if err != nil {
+		if err != nil {
-		t.Fatalf("did not find uint64 OID, %v", err)
+			t.Fatal(err)
-	}
+		}
-	conn.ConnInfo().RegisterDataType(pgtype.DataType{Value: &pgtype.Numeric{}, Name: "uint64", OID: uint64OID})
+		if n != 7 {
+			t.Fatalf("Expected n to be 7, but was %v", n)
+		}
 
-	// String is still an acceptable argument after registration
+		// But a uint64 is acceptable
-	err = conn.QueryRow(context.Background(), "select $1::uint64", "7").Scan(&n)
+		err = conn.QueryRow(context.Background(), "select $1::uint64", uint64(24)).Scan(&n)
-	if err != nil {
+		if err != nil {
-		t.Fatal(err)
+			t.Fatal(err)
-	}
+		}
-	if n != 7 {
+		if n != 24 {
-		t.Fatalf("Expected n to be 7, but was %v", n)
+			t.Fatalf("Expected n to be 24, but was %v", n)
-	}
+		}
-
+	})
-	// But a uint64 is acceptable
-	err = conn.QueryRow(context.Background(), "select $1::uint64", uint64(24)).Scan(&n)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != 24 {
-		t.Fatalf("Expected n to be 24, but was %v", n)
-	}
-
-	ensureConnValid(t, conn)
 }

extended_query_builder.go

@@ -134,6 +134,28 @@ func (eqb *extendedQueryBuilder) encodeExtendedParamValue(ci *pgtype.ConnInfo, o
 		return eqb.encodeExtendedParamValue(ci, oid, value)
 	}
 
+	// There is no data type registered for the destination OID, but maybe there is data type registered for the arg
+	// type. If so use it's text encoder (if available).
+	if dt, ok := ci.DataTypeForValue(arg); ok {
+		value := dt.Value
+		if textEncoder, ok := value.(pgtype.TextEncoder); ok {
+			err := value.Set(arg)
+			if err != nil {
+				return nil, err
+			}
+
+			buf, err = textEncoder.EncodeText(ci, eqb.paramValueBytes)
+			if err != nil {
+				return nil, err
+			}
+			if buf == nil {
+				return nil, nil
+			}
+			eqb.paramValueBytes = buf
+			return eqb.paramValueBytes[pos:], nil
+		}
+	}
+
 	if strippedArg, ok := stripNamedType(&refVal); ok {
 		return eqb.encodeExtendedParamValue(ci, oid, strippedArg)
 	}

go.mod

@@ -4,16 +4,18 @@ go 1.12
 
 require (
 	github.com/cockroachdb/apd v1.1.0
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/jackc/pgconn v1.5.0
 	github.com/jackc/pgio v1.0.0
 	github.com/jackc/pgproto3/v2 v2.0.1
-	github.com/jackc/pgtype v1.3.1-0.20200505182314-3b7c47a2a7da
+	github.com/jackc/pgtype v1.3.1-0.20200508211315-97bbe6ae20e2
 	github.com/jackc/puddle v1.1.1
 	github.com/rs/zerolog v1.15.0
 	github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.5.1
+	go.uber.org/multierr v1.5.0 // indirect
 	go.uber.org/zap v1.10.0
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec

go.sum

@@ -1,3 +1,4 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -11,6 +12,7 @@ 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 v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.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=
 github.com/jackc/chunkreader/v2 v2.0.0 h1:DUwgMQuuPnS0rhMXenUtZpqZqrR/30NWY+qQvTpSvEs=
@@ -53,6 +55,8 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU
 github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
 github.com/jackc/pgtype v1.3.1-0.20200505182314-3b7c47a2a7da h1:ZbfsOjqJ1nHsryU03mdXZy6ZEsymYvihkXxN9tUx1YU=
 github.com/jackc/pgtype v1.3.1-0.20200505182314-3b7c47a2a7da/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200508211315-97bbe6ae20e2 h1:Y6cErz3hUojOwnjUEWoZPRCBQcB7avM9ntGiYkB0wJo=
+github.com/jackc/pgtype v1.3.1-0.20200508211315-97bbe6ae20e2/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
@@ -65,6 +69,7 @@ github.com/jackc/puddle v1.1.0 h1:musOWczZC/rSbqut475Vfcczg7jJsdUQf0D6oKPLgNU=
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1 h1:PJAw7H/9hoWC4Kf3J8iNmL1SwA6E8vfsLqBiL+F6CtI=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
@@ -97,6 +102,7 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0 h1:hSNcYHyxDWycfePW7pUI8swuFkcSMPKh3E63Pokg1Hk=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -127,8 +133,13 @@ go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
@@ -136,11 +147,14 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -163,8 +177,12 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 h1:bhOzK9QyoD0ogCnFro1m2mz41+Ib0oOhfJnBp5MR4K4=
@@ -176,7 +194,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

helper_test.go

@@ -2,6 +2,7 @@ package pgx_test
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	"github.com/jackc/pgconn"
@@ -9,6 +10,45 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func testWithAndWithoutPreferSimpleProtocol(t *testing.T, f func(t *testing.T, conn *pgx.Conn)) {
+	t.Run("SimpleProto",
+		func(t *testing.T) {
+			config, err := pgx.ParseConfig(os.Getenv("PGX_TEST_DATABASE"))
+			require.NoError(t, err)
+
+			config.PreferSimpleProtocol = true
+			conn, err := pgx.ConnectConfig(context.Background(), config)
+			require.NoError(t, err)
+			defer func() {
+				err := conn.Close(context.Background())
+				require.NoError(t, err)
+			}()
+
+			f(t, conn)
+
+			ensureConnValid(t, conn)
+		},
+	)
+
+	t.Run("DefaultProto",
+		func(t *testing.T) {
+			config, err := pgx.ParseConfig(os.Getenv("PGX_TEST_DATABASE"))
+			require.NoError(t, err)
+
+			conn, err := pgx.ConnectConfig(context.Background(), config)
+			require.NoError(t, err)
+			defer func() {
+				err := conn.Close(context.Background())
+				require.NoError(t, err)
+			}()
+
+			f(t, conn)
+
+			ensureConnValid(t, conn)
+		},
+	)
+}
+
 func mustConnectString(t testing.TB, connString string) *pgx.Conn {
 	conn, err := pgx.Connect(context.Background(), connString)
 	if err != nil {

values.go

@@ -30,22 +30,9 @@ func convertSimpleArgument(ci *pgtype.ConnInfo, arg interface{}) (interface{}, e
 		return nil, nil
 	}
 
-	setArgAndEncodeTextToString := func(t interface {
+	refVal := reflect.ValueOf(arg)
-		pgtype.Value
+	if refVal.Kind() == reflect.Ptr && refVal.IsNil() {
-		pgtype.TextEncoder
+		return nil, nil
-	}) (interface{}, error) {
-		err := t.Set(arg)
-		if err != nil {
-			return nil, err
-		}
-		buf, err := t.EncodeText(ci, nil)
-		if err != nil {
-			return nil, err
-		}
-		if buf == nil {
-			return nil, nil
-		}
-		return string(buf), nil
 	}
 
 	switch arg := arg.(type) {
@@ -124,36 +111,25 @@ func convertSimpleArgument(ci *pgtype.ConnInfo, arg interface{}) (interface{}, e
 			return nil, errors.Errorf("arg too big for int64: %v", arg)
 		}
 		return int64(arg), nil
-	case []string:
-		return setArgAndEncodeTextToString(&pgtype.TextArray{})
-	case []float32:
-		return setArgAndEncodeTextToString(&pgtype.Float4Array{})
-	case []float64:
-		return setArgAndEncodeTextToString(&pgtype.Float8Array{})
-	case []int16:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []int32:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []int64:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []int:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []uint16:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []uint32:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []uint64:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
-	case []uint:
-		return setArgAndEncodeTextToString(&pgtype.Int8Array{})
 	}
 
-	refVal := reflect.ValueOf(arg)
+	if dt, found := ci.DataTypeForValue(arg); found {
-
+		v := dt.Value
-	if refVal.Kind() == reflect.Ptr {
+		err := v.Set(arg)
-		if refVal.IsNil() {
+		if err != nil {
+			return nil, err
+		}
+		buf, err := v.(pgtype.TextEncoder).EncodeText(ci, nil)
+		if err != nil {
+			return nil, err
+		}
+		if buf == nil {
 			return nil, nil
 		}
+		return string(buf), nil
+	}
+
+	if refVal.Kind() == reflect.Ptr {
 		arg = refVal.Elem().Interface()
 		return convertSimpleArgument(ci, arg)
 	}