From 94ba730bb1e9b968fc5a7c8dfe9bb435c4a9771e Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Sun, 10 May 2020 14:09:26 -0500
Subject: [PATCH] Use simplified pgtype ScanPlan

---
 rows.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/rows.go b/rows.go
index 91e231e3..63f0ea5d 100644
--- a/rows.go
+++ b/rows.go
@@ -111,7 +111,6 @@ type connRows struct {
 	multiResultReader *pgconn.MultiResultReader
 
 	scanPlans []pgtype.ScanPlan
-	dstValues []interface{}
 }
 
 func (rows *connRows) FieldDescriptions() []pgproto3.FieldDescription {
@@ -204,7 +203,12 @@ func (rows *connRows) Scan(dest ...interface{}) error {
 
 	if rows.scanPlans == nil {
 		rows.scanPlans = make([]pgtype.ScanPlan, len(values))
-		rows.dstValues = make([]interface{}, len(values))
+		for i, dst := range dest {
+			if dst == nil {
+				continue
+			}
+			rows.scanPlans[i] = ci.PlanScan(fieldDescriptions[i].DataTypeOID, fieldDescriptions[i].Format, values[i], dest[i])
+		}
 	}
 
 	for i, dst := range dest {
@@ -212,11 +216,6 @@ func (rows *connRows) Scan(dest ...interface{}) error {
 			continue
 		}
 
-		if dst != rows.dstValues[i] {
-			rows.scanPlans[i] = ci.PlanScan(fieldDescriptions[i].DataTypeOID, fieldDescriptions[i].Format, values[i], dest[i])
-			rows.dstValues[i] = dst
-		}
-
 		err := rows.scanPlans[i].Scan(ci, fieldDescriptions[i].DataTypeOID, fieldDescriptions[i].Format, values[i], dst)
 		if err != nil {
 			err = scanArgError{col: i, err: err}