From 9c538cd4a9cfe3483a382559b5e8f852943c8698 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Mon, 21 Feb 2022 09:30:01 -0600
Subject: [PATCH] Remove actualTarget argument

---
 pgtype/array_codec.go      | 6 +++---
 pgtype/bits.go             | 2 +-
 pgtype/bool.go             | 2 +-
 pgtype/box.go              | 2 +-
 pgtype/bytea.go            | 2 +-
 pgtype/circle.go           | 2 +-
 pgtype/composite.go        | 2 +-
 pgtype/date.go             | 2 +-
 pgtype/enum_codec.go       | 2 +-
 pgtype/float4.go           | 2 +-
 pgtype/float8.go           | 2 +-
 pgtype/hstore.go           | 2 +-
 pgtype/inet.go             | 2 +-
 pgtype/int.go              | 6 +++---
 pgtype/int.go.erb          | 2 +-
 pgtype/interval.go         | 2 +-
 pgtype/json.go             | 2 +-
 pgtype/jsonb.go            | 6 +++---
 pgtype/line.go             | 2 +-
 pgtype/lseg.go             | 2 +-
 pgtype/macaddr.go          | 2 +-
 pgtype/numeric.go          | 2 +-
 pgtype/numeric_test.go     | 2 +-
 pgtype/path.go             | 2 +-
 pgtype/pgtype.go           | 9 ++++-----
 pgtype/point.go            | 2 +-
 pgtype/polygon.go          | 2 +-
 pgtype/qchar.go            | 2 +-
 pgtype/range_codec.go      | 4 ++--
 pgtype/record_codec.go     | 2 +-
 pgtype/text.go             | 2 +-
 pgtype/tid.go              | 2 +-
 pgtype/time.go             | 2 +-
 pgtype/timestamp.go        | 2 +-
 pgtype/timestamp_test.go   | 2 +-
 pgtype/timestamptz.go      | 2 +-
 pgtype/timestamptz_test.go | 2 +-
 pgtype/uint32.go           | 2 +-
 pgtype/uuid.go             | 2 +-
 39 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/pgtype/array_codec.go b/pgtype/array_codec.go
index dd14e83e..74bcc5d3 100644
--- a/pgtype/array_codec.go
+++ b/pgtype/array_codec.go
@@ -210,7 +210,7 @@ func (p *encodePlanArrayCodecBinary) Encode(value interface{}, buf []byte) (newB
 	return buf, nil
 }
 
-func (c *ArrayCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (c *ArrayCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	arrayScanner, ok := target.(ArraySetter)
 	if !ok {
 		return nil
@@ -248,7 +248,7 @@ func (c *ArrayCodec) decodeBinary(m *Map, arrayOID uint32, src []byte, array Arr
 		return nil
 	}
 
-	elementScanPlan := c.ElementType.Codec.PlanScan(m, c.ElementType.OID, BinaryFormatCode, array.ScanIndex(0), false)
+	elementScanPlan := c.ElementType.Codec.PlanScan(m, c.ElementType.OID, BinaryFormatCode, array.ScanIndex(0))
 	if elementScanPlan == nil {
 		elementScanPlan = m.PlanScan(c.ElementType.OID, BinaryFormatCode, array.ScanIndex(0))
 	}
@@ -286,7 +286,7 @@ func (c *ArrayCodec) decodeText(m *Map, arrayOID uint32, src []byte, array Array
 		return nil
 	}
 
-	elementScanPlan := c.ElementType.Codec.PlanScan(m, c.ElementType.OID, TextFormatCode, array.ScanIndex(0), false)
+	elementScanPlan := c.ElementType.Codec.PlanScan(m, c.ElementType.OID, TextFormatCode, array.ScanIndex(0))
 	if elementScanPlan == nil {
 		elementScanPlan = m.PlanScan(c.ElementType.OID, TextFormatCode, array.ScanIndex(0))
 	}
diff --git a/pgtype/bits.go b/pgtype/bits.go
index 8afd8d90..12df03d5 100644
--- a/pgtype/bits.go
+++ b/pgtype/bits.go
@@ -126,7 +126,7 @@ func (encodePlanBitsCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return buf, nil
 }
 
-func (BitsCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (BitsCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/bool.go b/pgtype/bool.go
index 1158ad06..24ae5c5f 100644
--- a/pgtype/bool.go
+++ b/pgtype/bool.go
@@ -197,7 +197,7 @@ func (encodePlanBoolCodecTextBool) Encode(value interface{}, buf []byte) (newBuf
 	return buf, nil
 }
 
-func (BoolCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (BoolCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/box.go b/pgtype/box.go
index 6e44c436..25d4f153 100644
--- a/pgtype/box.go
+++ b/pgtype/box.go
@@ -126,7 +126,7 @@ func (encodePlanBoxCodecText) Encode(value interface{}, buf []byte) (newBuf []by
 	return buf, nil
 }
 
-func (BoxCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (BoxCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/bytea.go b/pgtype/bytea.go
index eb865df0..f3c33cb9 100644
--- a/pgtype/bytea.go
+++ b/pgtype/bytea.go
@@ -147,7 +147,7 @@ func (encodePlanBytesCodecTextBytesValuer) Encode(value interface{}, buf []byte)
 	return buf, nil
 }
 
-func (ByteaCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (ByteaCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/circle.go b/pgtype/circle.go
index 6a83b41f..6dfb4fae 100644
--- a/pgtype/circle.go
+++ b/pgtype/circle.go
@@ -125,7 +125,7 @@ func (encodePlanCircleCodecText) Encode(value interface{}, buf []byte) (newBuf [
 	return buf, nil
 }
 
-func (CircleCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (CircleCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
 		switch target.(type) {
diff --git a/pgtype/composite.go b/pgtype/composite.go
index c538834d..5a67c3df 100644
--- a/pgtype/composite.go
+++ b/pgtype/composite.go
@@ -109,7 +109,7 @@ func (plan *encodePlanCompositeCodecCompositeIndexGetterToText) Encode(value int
 	return b.Finish()
 }
 
-func (c *CompositeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (c *CompositeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
 		switch target.(type) {
diff --git a/pgtype/date.go b/pgtype/date.go
index bb3975a7..f59508d3 100644
--- a/pgtype/date.go
+++ b/pgtype/date.go
@@ -196,7 +196,7 @@ func (encodePlanDateCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return append(buf, s...), nil
 }
 
-func (DateCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (DateCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/enum_codec.go b/pgtype/enum_codec.go
index 3dce4449..ecad0d9f 100644
--- a/pgtype/enum_codec.go
+++ b/pgtype/enum_codec.go
@@ -38,7 +38,7 @@ func (EnumCodec) PlanEncode(m *Map, oid uint32, format int16, value interface{})
 	return nil
 }
 
-func (c *EnumCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (c *EnumCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case TextFormatCode, BinaryFormatCode:
 		switch target.(type) {
diff --git a/pgtype/float4.go b/pgtype/float4.go
index 9ca6fe6a..9b31579f 100644
--- a/pgtype/float4.go
+++ b/pgtype/float4.go
@@ -145,7 +145,7 @@ func (encodePlanFloat4CodecBinaryInt64Valuer) Encode(value interface{}, buf []by
 	return pgio.AppendUint32(buf, math.Float32bits(f)), nil
 }
 
-func (Float4Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Float4Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/float8.go b/pgtype/float8.go
index d5461ab0..30548b88 100644
--- a/pgtype/float8.go
+++ b/pgtype/float8.go
@@ -183,7 +183,7 @@ func (encodePlanTextInt64Valuer) Encode(value interface{}, buf []byte) (newBuf [
 	return append(buf, strconv.FormatInt(n.Int, 10)...), nil
 }
 
-func (Float8Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Float8Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/hstore.go b/pgtype/hstore.go
index a27330ae..46b3d236 100644
--- a/pgtype/hstore.go
+++ b/pgtype/hstore.go
@@ -150,7 +150,7 @@ func (encodePlanHstoreCodecText) Encode(value interface{}, buf []byte) (newBuf [
 	return buf, nil
 }
 
-func (HstoreCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (HstoreCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/inet.go b/pgtype/inet.go
index ab4cff47..a272e00b 100644
--- a/pgtype/inet.go
+++ b/pgtype/inet.go
@@ -140,7 +140,7 @@ func (encodePlanInetCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return append(buf, inet.IPNet.String()...), nil
 }
 
-func (InetCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (InetCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/int.go b/pgtype/int.go
index bfdb0184..a799f2bf 100644
--- a/pgtype/int.go
+++ b/pgtype/int.go
@@ -206,7 +206,7 @@ func (encodePlanInt2CodecTextInt64Valuer) Encode(value interface{}, buf []byte)
 	return append(buf, strconv.FormatInt(n.Int, 10)...), nil
 }
 
-func (Int2Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Int2Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
@@ -743,7 +743,7 @@ func (encodePlanInt4CodecTextInt64Valuer) Encode(value interface{}, buf []byte)
 	return append(buf, strconv.FormatInt(n.Int, 10)...), nil
 }
 
-func (Int4Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Int4Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
@@ -1291,7 +1291,7 @@ func (encodePlanInt8CodecTextInt64Valuer) Encode(value interface{}, buf []byte)
 	return append(buf, strconv.FormatInt(n.Int, 10)...), nil
 }
 
-func (Int8Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Int8Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/int.go.erb b/pgtype/int.go.erb
index cec88984..d3c519a7 100644
--- a/pgtype/int.go.erb
+++ b/pgtype/int.go.erb
@@ -207,7 +207,7 @@ func (encodePlanInt<%= pg_byte_size %>CodecTextInt64Valuer) Encode(value interfa
   return append(buf, strconv.FormatInt(n.Int, 10)...), nil
 }
 
-func (Int<%= pg_byte_size %>Codec) PlanScan(m *TypeMap, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Int<%= pg_byte_size %>Codec) PlanScan(m *TypeMap, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/interval.go b/pgtype/interval.go
index a13969c3..b4dcf0a6 100644
--- a/pgtype/interval.go
+++ b/pgtype/interval.go
@@ -151,7 +151,7 @@ func (encodePlanIntervalCodecText) Encode(value interface{}, buf []byte) (newBuf
 	return buf, nil
 }
 
-func (IntervalCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (IntervalCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/json.go b/pgtype/json.go
index 04ce6f6b..e8882d3a 100644
--- a/pgtype/json.go
+++ b/pgtype/json.go
@@ -49,7 +49,7 @@ func (encodePlanJSONCodecEitherFormatMarshal) Encode(value interface{}, buf []by
 	return buf, nil
 }
 
-func (JSONCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (JSONCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch target.(type) {
 	case *string:
 		return scanPlanAnyToString{}
diff --git a/pgtype/jsonb.go b/pgtype/jsonb.go
index 0504ee62..7e3d3f8d 100644
--- a/pgtype/jsonb.go
+++ b/pgtype/jsonb.go
@@ -39,15 +39,15 @@ func (plan *encodePlanJSONBCodecBinaryWrapper) Encode(value interface{}, buf []b
 	return plan.textPlan.Encode(value, buf)
 }
 
-func (JSONBCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (JSONBCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
-		plan := JSONCodec{}.PlanScan(m, oid, TextFormatCode, target, actualTarget)
+		plan := JSONCodec{}.PlanScan(m, oid, TextFormatCode, target)
 		if plan != nil {
 			return &scanPlanJSONBCodecBinaryUnwrapper{textPlan: plan}
 		}
 	case TextFormatCode:
-		return JSONCodec{}.PlanScan(m, oid, format, target, actualTarget)
+		return JSONCodec{}.PlanScan(m, oid, format, target)
 	}
 
 	return nil
diff --git a/pgtype/line.go b/pgtype/line.go
index 17acab81..c9cac4a7 100644
--- a/pgtype/line.go
+++ b/pgtype/line.go
@@ -128,7 +128,7 @@ func (encodePlanLineCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return buf, nil
 }
 
-func (LineCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (LineCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/lseg.go b/pgtype/lseg.go
index 8f65c7c3..4243f6e0 100644
--- a/pgtype/lseg.go
+++ b/pgtype/lseg.go
@@ -126,7 +126,7 @@ func (encodePlanLsegCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return buf, nil
 }
 
-func (LsegCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (LsegCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/macaddr.go b/pgtype/macaddr.go
index 23ca55d1..686e759a 100644
--- a/pgtype/macaddr.go
+++ b/pgtype/macaddr.go
@@ -78,7 +78,7 @@ func (encodePlanMacaddrCodecTextHardwareAddr) Encode(value interface{}, buf []by
 	return append(buf, addr.String()...), nil
 }
 
-func (MacaddrCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (MacaddrCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
 		switch target.(type) {
diff --git a/pgtype/numeric.go b/pgtype/numeric.go
index 3e7f972f..41bf1432 100644
--- a/pgtype/numeric.go
+++ b/pgtype/numeric.go
@@ -501,7 +501,7 @@ func encodeNumericText(n Numeric, buf []byte) (newBuf []byte, err error) {
 	return buf, nil
 }
 
-func (NumericCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (NumericCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/numeric_test.go b/pgtype/numeric_test.go
index 950e5b11..91b77881 100644
--- a/pgtype/numeric_test.go
+++ b/pgtype/numeric_test.go
@@ -63,7 +63,7 @@ func isExpectedEqNumeric(a interface{}) func(interface{}) bool {
 
 func mustParseNumeric(t *testing.T, src string) pgtype.Numeric {
 	var n pgtype.Numeric
-	plan := pgtype.NumericCodec{}.PlanScan(nil, pgtype.NumericOID, pgtype.TextFormatCode, &n, false)
+	plan := pgtype.NumericCodec{}.PlanScan(nil, pgtype.NumericOID, pgtype.TextFormatCode, &n)
 	require.NotNil(t, plan)
 	err := plan.Scan([]byte(src), &n)
 	require.NoError(t, err)
diff --git a/pgtype/path.go b/pgtype/path.go
index c1355e41..3b8e598e 100644
--- a/pgtype/path.go
+++ b/pgtype/path.go
@@ -153,7 +153,7 @@ func (encodePlanPathCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return buf, nil
 }
 
-func (PathCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (PathCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/pgtype.go b/pgtype/pgtype.go
index b42773bc..70c1059c 100644
--- a/pgtype/pgtype.go
+++ b/pgtype/pgtype.go
@@ -144,9 +144,8 @@ type Codec interface {
 	PlanEncode(m *Map, oid uint32, format int16, value interface{}) EncodePlan
 
 	// PlanScan returns a ScanPlan for scanning a PostgreSQL value into a destination with the same type as target. If
-	// actualTarget is true then the returned ScanPlan may be optimized to directly scan into target. If no plan can be
-	// found then nil is returned.
-	PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan
+	// no plan can be found then nil is returned.
+	PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan
 
 	// DecodeDatabaseSQLValue returns src decoded into a value compatible with the sql.Scanner interface.
 	DecodeDatabaseSQLValue(m *Map, oid uint32, format int16, src []byte) (driver.Value, error)
@@ -1030,7 +1029,7 @@ func (m *Map) PlanScan(oid uint32, formatCode int16, target interface{}) ScanPla
 	}
 
 	if dt != nil {
-		if plan := dt.Codec.PlanScan(m, oid, formatCode, target, false); plan != nil {
+		if plan := dt.Codec.PlanScan(m, oid, formatCode, target); plan != nil {
 			return plan
 		}
 	}
@@ -1094,7 +1093,7 @@ func scanUnknownType(oid uint32, formatCode int16, buf []byte, dest interface{})
 var ErrScanTargetTypeChanged = errors.New("scan target type changed")
 
 func codecScan(codec Codec, m *Map, oid uint32, format int16, src []byte, dst interface{}) error {
-	scanPlan := codec.PlanScan(m, oid, format, dst, true)
+	scanPlan := codec.PlanScan(m, oid, format, dst)
 	if scanPlan == nil {
 		return fmt.Errorf("PlanScan did not find a plan")
 	}
diff --git a/pgtype/point.go b/pgtype/point.go
index 4a9637ee..8df57703 100644
--- a/pgtype/point.go
+++ b/pgtype/point.go
@@ -177,7 +177,7 @@ func (encodePlanPointCodecText) Encode(value interface{}, buf []byte) (newBuf []
 	)...), nil
 }
 
-func (PointCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (PointCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/polygon.go b/pgtype/polygon.go
index 5a090ff0..ca479965 100644
--- a/pgtype/polygon.go
+++ b/pgtype/polygon.go
@@ -138,7 +138,7 @@ func (encodePlanPolygonCodecText) Encode(value interface{}, buf []byte) (newBuf
 	return buf, nil
 }
 
-func (PolygonCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (PolygonCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/qchar.go b/pgtype/qchar.go
index ce2c3dcb..677b9003 100644
--- a/pgtype/qchar.go
+++ b/pgtype/qchar.go
@@ -56,7 +56,7 @@ func (encodePlanQcharCodecRune) Encode(value interface{}, buf []byte) (newBuf []
 	return buf, nil
 }
 
-func (QCharCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (QCharCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case TextFormatCode, BinaryFormatCode:
 		switch target.(type) {
diff --git a/pgtype/range_codec.go b/pgtype/range_codec.go
index 9628ce4b..0fa43a68 100644
--- a/pgtype/range_codec.go
+++ b/pgtype/range_codec.go
@@ -270,7 +270,7 @@ func (plan *encodePlanRangeCodecRangeValuerToText) Encode(value interface{}, buf
 	return buf, nil
 }
 
-func (c *RangeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (c *RangeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
 		switch target.(type) {
@@ -410,6 +410,6 @@ func (c *RangeCodec) DecodeValue(m *Map, oid uint32, format int16, src []byte) (
 	}
 
 	var r GenericRange
-	err := c.PlanScan(m, oid, format, &r, true).Scan(src, &r)
+	err := c.PlanScan(m, oid, format, &r).Scan(src, &r)
 	return r, err
 }
diff --git a/pgtype/record_codec.go b/pgtype/record_codec.go
index c31aa63c..a5c72aac 100644
--- a/pgtype/record_codec.go
+++ b/pgtype/record_codec.go
@@ -25,7 +25,7 @@ func (RecordCodec) PlanEncode(m *Map, oid uint32, format int16, value interface{
 	return nil
 }
 
-func (RecordCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (RecordCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	if format == BinaryFormatCode {
 		switch target.(type) {
 		case CompositeIndexScanner:
diff --git a/pgtype/text.go b/pgtype/text.go
index 2c551958..82e7753c 100644
--- a/pgtype/text.go
+++ b/pgtype/text.go
@@ -156,7 +156,7 @@ func (encodePlanTextCodecTextValuer) Encode(value interface{}, buf []byte) (newB
 	return buf, nil
 }
 
-func (TextCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (TextCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case TextFormatCode, BinaryFormatCode:
diff --git a/pgtype/tid.go b/pgtype/tid.go
index 2744cb15..5faa7502 100644
--- a/pgtype/tid.go
+++ b/pgtype/tid.go
@@ -130,7 +130,7 @@ func (encodePlanTIDCodecText) Encode(value interface{}, buf []byte) (newBuf []by
 	return buf, nil
 }
 
-func (TIDCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (TIDCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/time.go b/pgtype/time.go
index 71e7f597..dc40f1fc 100644
--- a/pgtype/time.go
+++ b/pgtype/time.go
@@ -129,7 +129,7 @@ func (encodePlanTimeCodecText) Encode(value interface{}, buf []byte) (newBuf []b
 	return append(buf, s...), nil
 }
 
-func (TimeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (TimeCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/timestamp.go b/pgtype/timestamp.go
index 314d7371..03fb2b28 100644
--- a/pgtype/timestamp.go
+++ b/pgtype/timestamp.go
@@ -152,7 +152,7 @@ func discardTimeZone(t time.Time) time.Time {
 	return t
 }
 
-func (TimestampCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (TimestampCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/timestamp_test.go b/pgtype/timestamp_test.go
index 562bb192..a33ce78f 100644
--- a/pgtype/timestamp_test.go
+++ b/pgtype/timestamp_test.go
@@ -51,7 +51,7 @@ func TestTimestampTranscodeBigTimeBinary(t *testing.T) {
 func TestTimestampCodecDecodeTextInvalid(t *testing.T) {
 	c := &pgtype.TimestampCodec{}
 	var ts pgtype.Timestamp
-	plan := c.PlanScan(nil, pgtype.TimestampOID, pgtype.TextFormatCode, &ts, false)
+	plan := c.PlanScan(nil, pgtype.TimestampOID, pgtype.TextFormatCode, &ts)
 	err := plan.Scan([]byte(`eeeee`), &ts)
 	require.Error(t, err)
 }
diff --git a/pgtype/timestamptz.go b/pgtype/timestamptz.go
index 46554f54..8be5970c 100644
--- a/pgtype/timestamptz.go
+++ b/pgtype/timestamptz.go
@@ -200,7 +200,7 @@ func (encodePlanTimestamptzCodecText) Encode(value interface{}, buf []byte) (new
 	return buf, nil
 }
 
-func (TimestamptzCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (TimestamptzCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/timestamptz_test.go b/pgtype/timestamptz_test.go
index ec408f47..ec198fa1 100644
--- a/pgtype/timestamptz_test.go
+++ b/pgtype/timestamptz_test.go
@@ -51,7 +51,7 @@ func TestTimestamptzTranscodeBigTimeBinary(t *testing.T) {
 func TestTimestamptzDecodeTextInvalid(t *testing.T) {
 	c := &pgtype.TimestamptzCodec{}
 	var tstz pgtype.Timestamptz
-	plan := c.PlanScan(nil, pgtype.TimestamptzOID, pgtype.TextFormatCode, &tstz, false)
+	plan := c.PlanScan(nil, pgtype.TimestamptzOID, pgtype.TextFormatCode, &tstz)
 	err := plan.Scan([]byte(`eeeee`), &tstz)
 	require.Error(t, err)
 }
diff --git a/pgtype/uint32.go b/pgtype/uint32.go
index 44238fa0..d406f79b 100644
--- a/pgtype/uint32.go
+++ b/pgtype/uint32.go
@@ -196,7 +196,7 @@ func (encodePlanUint32CodecTextInt64Valuer) Encode(value interface{}, buf []byte
 	return append(buf, strconv.FormatInt(v.Int, 10)...), nil
 }
 
-func (Uint32Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (Uint32Codec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 
 	switch format {
 	case BinaryFormatCode:
diff --git a/pgtype/uuid.go b/pgtype/uuid.go
index 39df8537..a561bed9 100644
--- a/pgtype/uuid.go
+++ b/pgtype/uuid.go
@@ -167,7 +167,7 @@ func (encodePlanUUIDCodecTextUUIDValuer) Encode(value interface{}, buf []byte) (
 	return append(buf, encodeUUID(uuid.Bytes)...), nil
 }
 
-func (UUIDCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+func (UUIDCodec) PlanScan(m *Map, oid uint32, format int16, target interface{}) ScanPlan {
 	switch format {
 	case BinaryFormatCode:
 		switch target.(type) {