From f6feb39655d06711d98be200c79e136c5fe917a5 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Thu, 23 Jan 2020 20:41:22 -0600
Subject: [PATCH] Fix Rows.Values() fallback to generic decoder

fixes #666
---
 query_test.go | 20 ++++++++++++++++++++
 rows.go       |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/query_test.go b/query_test.go
index 90ad8d01..28b0fb5d 100644
--- a/query_test.go
+++ b/query_test.go
@@ -177,6 +177,26 @@ func TestConnQueryValues(t *testing.T) {
 	}
 }
 
+// https://github.com/jackc/pgx/issues/666
+func TestConnQueryValuesWhenUnableToDecode(t *testing.T) {
+	t.Parallel()
+
+	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
+	defer closeConn(t, conn)
+
+	// Note that this relies on pgtype.Record not supporting the text protocol. This seems safe as it is impossible to
+	// decode the text protocol because unlike the binary protocal there is no way to determine the OIDs of the elements.
+	rows, err := conn.Query(context.Background(), "select (array[1::oid], null)", pgx.QueryResultFormats{pgx.TextFormatCode})
+	require.NoError(t, err)
+	defer rows.Close()
+
+	require.True(t, rows.Next())
+
+	values, err := rows.Values()
+	require.NoError(t, err)
+	require.Equal(t, "({1},)", values[0])
+}
+
 // https://github.com/jackc/pgx/issues/478
 func TestConnQueryReadRowMultipleTimes(t *testing.T) {
 	t.Parallel()
diff --git a/rows.go b/rows.go
index 803bf3b3..3474dd79 100644
--- a/rows.go
+++ b/rows.go
@@ -214,8 +214,8 @@ func (rows *connRows) Values() ([]interface{}, error) {
 
 			switch fd.Format {
 			case TextFormatCode:
-				decoder := value.(pgtype.TextDecoder)
-				if decoder == nil {
+				decoder, ok := value.(pgtype.TextDecoder)
+				if !ok {
 					decoder = &pgtype.GenericText{}
 				}
 				err := decoder.DecodeText(rows.connInfo, buf)
@@ -224,8 +224,8 @@ func (rows *connRows) Values() ([]interface{}, error) {
 				}
 				values = append(values, decoder.(pgtype.Value).Get())
 			case BinaryFormatCode:
-				decoder := value.(pgtype.BinaryDecoder)
-				if decoder == nil {
+				decoder, ok := value.(pgtype.BinaryDecoder)
+				if !ok {
 					decoder = &pgtype.GenericBinary{}
 				}
 				err := decoder.DecodeBinary(rows.connInfo, buf)