diff --git a/pgtype/builtin_wrappers.go b/pgtype/builtin_wrappers.go
index 5453bf18..b653260e 100644
--- a/pgtype/builtin_wrappers.go
+++ b/pgtype/builtin_wrappers.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"time"
 )
 
 type int8Wrapper int8
@@ -315,3 +316,27 @@ func (w stringWrapper) Int64Value() (Int8, error) {
 
 	return Int8{Int: int64(num), Valid: true}, nil
 }
+
+type timeWrapper time.Time
+
+func (w *timeWrapper) ScanDate(v Date) error {
+	if !v.Valid {
+		return fmt.Errorf("cannot scan NULL into *time.Time")
+	}
+
+	switch v.InfinityModifier {
+	case None:
+		*w = timeWrapper(v.Time)
+		return nil
+	case Infinity:
+		return fmt.Errorf("cannot scan Infinity into *time.Time")
+	case NegativeInfinity:
+		return fmt.Errorf("cannot scan -Infinity into *time.Time")
+	default:
+		return fmt.Errorf("invalid InfinityModifier: %v", v.InfinityModifier)
+	}
+}
+
+func (w timeWrapper) DateValue() (Date, error) {
+	return Date{Time: time.Time(w), Valid: true}, nil
+}
diff --git a/pgtype/date.go b/pgtype/date.go
index 5b7f47e6..fde66745 100644
--- a/pgtype/date.go
+++ b/pgtype/date.go
@@ -10,10 +10,27 @@ import (
 	"github.com/jackc/pgio"
 )
 
+type DateScanner interface {
+	ScanDate(v Date) error
+}
+
+type DateValuer interface {
+	DateValue() (Date, error)
+}
+
 type Date struct {
 	Time             time.Time
-	Valid            bool
 	InfinityModifier InfinityModifier
+	Valid            bool
+}
+
+func (d *Date) ScanDate(v Date) error {
+	*d = v
+	return nil
+}
+
+func (d Date) DateValue() (Date, error) {
+	return d, nil
 }
 
 const (
@@ -21,166 +38,6 @@ const (
 	infinityDayOffset         = 2147483647
 )
 
-func (dst *Date) Set(src interface{}) error {
-	if src == nil {
-		*dst = Date{}
-		return nil
-	}
-
-	if value, ok := src.(interface{ Get() interface{} }); ok {
-		value2 := value.Get()
-		if value2 != value {
-			return dst.Set(value2)
-		}
-	}
-
-	switch value := src.(type) {
-	case time.Time:
-		*dst = Date{Time: value, Valid: true}
-	case string:
-		return dst.DecodeText(nil, []byte(value))
-	case *time.Time:
-		if value == nil {
-			*dst = Date{}
-		} else {
-			return dst.Set(*value)
-		}
-	case *string:
-		if value == nil {
-			*dst = Date{}
-		} else {
-			return dst.Set(*value)
-		}
-	default:
-		if originalSrc, ok := underlyingTimeType(src); ok {
-			return dst.Set(originalSrc)
-		}
-		return fmt.Errorf("cannot convert %v to Date", value)
-	}
-
-	return nil
-}
-
-func (dst Date) Get() interface{} {
-	if !dst.Valid {
-		return nil
-	}
-	if dst.InfinityModifier != None {
-		return dst.InfinityModifier
-	}
-	return dst.Time
-}
-
-func (src *Date) AssignTo(dst interface{}) error {
-	if !src.Valid {
-		return NullAssignTo(dst)
-	}
-
-	switch v := dst.(type) {
-	case *time.Time:
-		if src.InfinityModifier != None {
-			return fmt.Errorf("cannot assign %v to %T", src, dst)
-		}
-		*v = src.Time
-		return nil
-	default:
-		if nextDst, retry := GetAssignToDstType(dst); retry {
-			return src.AssignTo(nextDst)
-		}
-		return fmt.Errorf("unable to assign to %T", dst)
-	}
-}
-
-func (dst *Date) DecodeText(ci *ConnInfo, src []byte) error {
-	if src == nil {
-		*dst = Date{}
-		return nil
-	}
-
-	sbuf := string(src)
-	switch sbuf {
-	case "infinity":
-		*dst = Date{Valid: true, InfinityModifier: Infinity}
-	case "-infinity":
-		*dst = Date{Valid: true, InfinityModifier: -Infinity}
-	default:
-		t, err := time.ParseInLocation("2006-01-02", sbuf, time.UTC)
-		if err != nil {
-			return err
-		}
-
-		*dst = Date{Time: t, Valid: true}
-	}
-
-	return nil
-}
-
-func (dst *Date) DecodeBinary(ci *ConnInfo, src []byte) error {
-	if src == nil {
-		*dst = Date{}
-		return nil
-	}
-
-	if len(src) != 4 {
-		return fmt.Errorf("invalid length for date: %v", len(src))
-	}
-
-	dayOffset := int32(binary.BigEndian.Uint32(src))
-
-	switch dayOffset {
-	case infinityDayOffset:
-		*dst = Date{Valid: true, InfinityModifier: Infinity}
-	case negativeInfinityDayOffset:
-		*dst = Date{Valid: true, InfinityModifier: -Infinity}
-	default:
-		t := time.Date(2000, 1, int(1+dayOffset), 0, 0, 0, 0, time.UTC)
-		*dst = Date{Time: t, Valid: true}
-	}
-
-	return nil
-}
-
-func (src Date) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
-	if !src.Valid {
-		return nil, nil
-	}
-
-	var s string
-
-	switch src.InfinityModifier {
-	case None:
-		s = src.Time.Format("2006-01-02")
-	case Infinity:
-		s = "infinity"
-	case NegativeInfinity:
-		s = "-infinity"
-	}
-
-	return append(buf, s...), nil
-}
-
-func (src Date) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
-	if !src.Valid {
-		return nil, nil
-	}
-
-	var daysSinceDateEpoch int32
-	switch src.InfinityModifier {
-	case None:
-		tUnix := time.Date(src.Time.Year(), src.Time.Month(), src.Time.Day(), 0, 0, 0, 0, time.UTC).Unix()
-		dateEpoch := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).Unix()
-
-		secSinceDateEpoch := tUnix - dateEpoch
-		daysSinceDateEpoch = int32(secSinceDateEpoch / 86400)
-	case Infinity:
-		daysSinceDateEpoch = infinityDayOffset
-	case NegativeInfinity:
-		daysSinceDateEpoch = negativeInfinityDayOffset
-	}
-
-	return pgio.AppendInt32(buf, daysSinceDateEpoch), nil
-}
-
 // Scan implements the database/sql Scanner interface.
 func (dst *Date) Scan(src interface{}) error {
 	if src == nil {
@@ -190,11 +47,7 @@ func (dst *Date) Scan(src interface{}) error {
 
 	switch src := src.(type) {
 	case string:
-		return dst.DecodeText(nil, []byte(src))
-	case []byte:
-		srcCopy := make([]byte, len(src))
-		copy(srcCopy, src)
-		return dst.DecodeText(nil, srcCopy)
+		return scanPlanTextAnyToDateScanner{}.Scan(nil, 0, TextFormatCode, []byte(src), dst)
 	case time.Time:
 		*dst = Date{Time: src, Valid: true}
 		return nil
@@ -262,3 +115,181 @@ func (dst *Date) UnmarshalJSON(b []byte) error {
 
 	return nil
 }
+
+type DateCodec struct{}
+
+func (DateCodec) FormatSupported(format int16) bool {
+	return format == TextFormatCode || format == BinaryFormatCode
+}
+
+func (DateCodec) PreferredFormat() int16 {
+	return BinaryFormatCode
+}
+
+func (DateCodec) PlanEncode(ci *ConnInfo, oid uint32, format int16, value interface{}) EncodePlan {
+	if _, ok := value.(DateValuer); !ok {
+		return nil
+	}
+
+	switch format {
+	case BinaryFormatCode:
+		return encodePlanDateCodecBinary{}
+	case TextFormatCode:
+		return encodePlanDateCodecText{}
+	}
+
+	return nil
+}
+
+type encodePlanDateCodecBinary struct{}
+
+func (encodePlanDateCodecBinary) Encode(value interface{}, buf []byte) (newBuf []byte, err error) {
+	date, err := value.(DateValuer).DateValue()
+	if err != nil {
+		return nil, err
+	}
+
+	if !date.Valid {
+		return nil, nil
+	}
+
+	var daysSinceDateEpoch int32
+	switch date.InfinityModifier {
+	case None:
+		tUnix := time.Date(date.Time.Year(), date.Time.Month(), date.Time.Day(), 0, 0, 0, 0, time.UTC).Unix()
+		dateEpoch := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).Unix()
+
+		secSinceDateEpoch := tUnix - dateEpoch
+		daysSinceDateEpoch = int32(secSinceDateEpoch / 86400)
+	case Infinity:
+		daysSinceDateEpoch = infinityDayOffset
+	case NegativeInfinity:
+		daysSinceDateEpoch = negativeInfinityDayOffset
+	}
+
+	return pgio.AppendInt32(buf, daysSinceDateEpoch), nil
+}
+
+type encodePlanDateCodecText struct{}
+
+func (encodePlanDateCodecText) Encode(value interface{}, buf []byte) (newBuf []byte, err error) {
+	date, err := value.(DateValuer).DateValue()
+	if err != nil {
+		return nil, err
+	}
+
+	if !date.Valid {
+		return nil, nil
+	}
+
+	var s string
+
+	switch date.InfinityModifier {
+	case None:
+		s = date.Time.Format("2006-01-02")
+	case Infinity:
+		s = "infinity"
+	case NegativeInfinity:
+		s = "-infinity"
+	}
+
+	return append(buf, s...), nil
+}
+
+func (DateCodec) PlanScan(ci *ConnInfo, oid uint32, format int16, target interface{}, actualTarget bool) ScanPlan {
+
+	switch format {
+	case BinaryFormatCode:
+		switch target.(type) {
+		case DateScanner:
+			return scanPlanBinaryDateToDateScanner{}
+		}
+	case TextFormatCode:
+		switch target.(type) {
+		case DateScanner:
+			return scanPlanTextAnyToDateScanner{}
+		}
+	}
+
+	return nil
+}
+
+type scanPlanBinaryDateToDateScanner struct{}
+
+func (scanPlanBinaryDateToDateScanner) Scan(ci *ConnInfo, oid uint32, formatCode int16, src []byte, dst interface{}) error {
+	scanner := (dst).(DateScanner)
+
+	if src == nil {
+		return scanner.ScanDate(Date{})
+	}
+
+	if len(src) != 4 {
+		return fmt.Errorf("invalid length for date: %v", len(src))
+	}
+
+	dayOffset := int32(binary.BigEndian.Uint32(src))
+
+	switch dayOffset {
+	case infinityDayOffset:
+		return scanner.ScanDate(Date{InfinityModifier: Infinity, Valid: true})
+	case negativeInfinityDayOffset:
+		return scanner.ScanDate(Date{InfinityModifier: -Infinity, Valid: true})
+	default:
+		t := time.Date(2000, 1, int(1+dayOffset), 0, 0, 0, 0, time.UTC)
+		return scanner.ScanDate(Date{Time: t, Valid: true})
+	}
+}
+
+type scanPlanTextAnyToDateScanner struct{}
+
+func (scanPlanTextAnyToDateScanner) Scan(ci *ConnInfo, oid uint32, formatCode int16, src []byte, dst interface{}) error {
+	scanner := (dst).(DateScanner)
+
+	if src == nil {
+		return scanner.ScanDate(Date{})
+	}
+
+	sbuf := string(src)
+	switch sbuf {
+	case "infinity":
+		return scanner.ScanDate(Date{InfinityModifier: Infinity, Valid: true})
+	case "-infinity":
+		return scanner.ScanDate(Date{InfinityModifier: -Infinity, Valid: true})
+	default:
+		t, err := time.ParseInLocation("2006-01-02", sbuf, time.UTC)
+		if err != nil {
+			return err
+		}
+
+		return scanner.ScanDate(Date{Time: t, Valid: true})
+	}
+}
+
+func (c DateCodec) DecodeDatabaseSQLValue(ci *ConnInfo, oid uint32, format int16, src []byte) (driver.Value, error) {
+	return codecDecodeToTextFormat(c, ci, oid, format, src)
+}
+
+func (c DateCodec) DecodeValue(ci *ConnInfo, oid uint32, format int16, src []byte) (interface{}, error) {
+	if src == nil {
+		return nil, nil
+	}
+
+	var date Date
+	err := codecScan(c, ci, oid, format, src, &date)
+	if err != nil {
+		return nil, err
+	}
+
+	if date.Valid {
+		switch date.InfinityModifier {
+		case None:
+			return date.Time, nil
+		case Infinity:
+			return "infinity", nil
+		case NegativeInfinity:
+			return "-infinity", nil
+		}
+	}
+
+	return nil, nil
+}
diff --git a/pgtype/date_array.go b/pgtype/date_array.go
deleted file mode 100644
index 9d3b32e2..00000000
--- a/pgtype/date_array.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// Code generated by erb. DO NOT EDIT.
-
-package pgtype
-
-import (
-	"database/sql/driver"
-	"encoding/binary"
-	"fmt"
-	"reflect"
-	"time"
-
-	"github.com/jackc/pgio"
-)
-
-type DateArray struct {
-	Elements   []Date
-	Dimensions []ArrayDimension
-	Valid      bool
-}
-
-func (dst *DateArray) Set(src interface{}) error {
-	// untyped nil and typed nil interfaces are different
-	if src == nil {
-		*dst = DateArray{}
-		return nil
-	}
-
-	if value, ok := src.(interface{ Get() interface{} }); ok {
-		value2 := value.Get()
-		if value2 != value {
-			return dst.Set(value2)
-		}
-	}
-
-	// Attempt to match to select common types:
-	switch value := src.(type) {
-
-	case []time.Time:
-		if value == nil {
-			*dst = DateArray{}
-		} else if len(value) == 0 {
-			*dst = DateArray{Valid: true}
-		} else {
-			elements := make([]Date, len(value))
-			for i := range value {
-				if err := elements[i].Set(value[i]); err != nil {
-					return err
-				}
-			}
-			*dst = DateArray{
-				Elements:   elements,
-				Dimensions: []ArrayDimension{{Length: int32(len(elements)), LowerBound: 1}},
-				Valid:      true,
-			}
-		}
-
-	case []*time.Time:
-		if value == nil {
-			*dst = DateArray{}
-		} else if len(value) == 0 {
-			*dst = DateArray{Valid: true}
-		} else {
-			elements := make([]Date, len(value))
-			for i := range value {
-				if err := elements[i].Set(value[i]); err != nil {
-					return err
-				}
-			}
-			*dst = DateArray{
-				Elements:   elements,
-				Dimensions: []ArrayDimension{{Length: int32(len(elements)), LowerBound: 1}},
-				Valid:      true,
-			}
-		}
-
-	case []Date:
-		if value == nil {
-			*dst = DateArray{}
-		} else if len(value) == 0 {
-			*dst = DateArray{Valid: true}
-		} else {
-			*dst = DateArray{
-				Elements:   value,
-				Dimensions: []ArrayDimension{{Length: int32(len(value)), LowerBound: 1}},
-				Valid:      true,
-			}
-		}
-	default:
-		// Fallback to reflection if an optimised match was not found.
-		// The reflection is necessary for arrays and multidimensional slices,
-		// but it comes with a 20-50% performance penalty for large arrays/slices
-		reflectedValue := reflect.ValueOf(src)
-		if !reflectedValue.IsValid() || reflectedValue.IsZero() {
-			*dst = DateArray{}
-			return nil
-		}
-
-		dimensions, elementsLength, ok := findDimensionsFromValue(reflectedValue, nil, 0)
-		if !ok {
-			return fmt.Errorf("cannot find dimensions of %v for DateArray", src)
-		}
-		if elementsLength == 0 {
-			*dst = DateArray{Valid: true}
-			return nil
-		}
-		if len(dimensions) == 0 {
-			if originalSrc, ok := underlyingSliceType(src); ok {
-				return dst.Set(originalSrc)
-			}
-			return fmt.Errorf("cannot convert %v to DateArray", src)
-		}
-
-		*dst = DateArray{
-			Elements:   make([]Date, elementsLength),
-			Dimensions: dimensions,
-			Valid:      true,
-		}
-		elementCount, err := dst.setRecursive(reflectedValue, 0, 0)
-		if err != nil {
-			// Maybe the target was one dimension too far, try again:
-			if len(dst.Dimensions) > 1 {
-				dst.Dimensions = dst.Dimensions[:len(dst.Dimensions)-1]
-				elementsLength = 0
-				for _, dim := range dst.Dimensions {
-					if elementsLength == 0 {
-						elementsLength = int(dim.Length)
-					} else {
-						elementsLength *= int(dim.Length)
-					}
-				}
-				dst.Elements = make([]Date, elementsLength)
-				elementCount, err = dst.setRecursive(reflectedValue, 0, 0)
-				if err != nil {
-					return err
-				}
-			} else {
-				return err
-			}
-		}
-		if elementCount != len(dst.Elements) {
-			return fmt.Errorf("cannot convert %v to DateArray, expected %d dst.Elements, but got %d instead", src, len(dst.Elements), elementCount)
-		}
-	}
-
-	return nil
-}
-
-func (dst *DateArray) setRecursive(value reflect.Value, index, dimension int) (int, error) {
-	switch value.Kind() {
-	case reflect.Array:
-		fallthrough
-	case reflect.Slice:
-		if len(dst.Dimensions) == dimension {
-			break
-		}
-
-		valueLen := value.Len()
-		if int32(valueLen) != dst.Dimensions[dimension].Length {
-			return 0, fmt.Errorf("multidimensional arrays must have array expressions with matching dimensions")
-		}
-		for i := 0; i < valueLen; i++ {
-			var err error
-			index, err = dst.setRecursive(value.Index(i), index, dimension+1)
-			if err != nil {
-				return 0, err
-			}
-		}
-
-		return index, nil
-	}
-	if !value.CanInterface() {
-		return 0, fmt.Errorf("cannot convert all values to DateArray")
-	}
-	if err := dst.Elements[index].Set(value.Interface()); err != nil {
-		return 0, fmt.Errorf("%v in DateArray", err)
-	}
-	index++
-
-	return index, nil
-}
-
-func (dst DateArray) Get() interface{} {
-	if !dst.Valid {
-		return nil
-	}
-	return dst
-}
-
-func (src *DateArray) AssignTo(dst interface{}) error {
-	if !src.Valid {
-		return NullAssignTo(dst)
-	}
-
-	if len(src.Dimensions) <= 1 {
-		// Attempt to match to select common types:
-		switch v := dst.(type) {
-
-		case *[]time.Time:
-			*v = make([]time.Time, len(src.Elements))
-			for i := range src.Elements {
-				if err := src.Elements[i].AssignTo(&((*v)[i])); err != nil {
-					return err
-				}
-			}
-			return nil
-
-		case *[]*time.Time:
-			*v = make([]*time.Time, len(src.Elements))
-			for i := range src.Elements {
-				if err := src.Elements[i].AssignTo(&((*v)[i])); err != nil {
-					return err
-				}
-			}
-			return nil
-
-		}
-	}
-
-	// Try to convert to something AssignTo can use directly.
-	if nextDst, retry := GetAssignToDstType(dst); retry {
-		return src.AssignTo(nextDst)
-	}
-
-	// Fallback to reflection if an optimised match was not found.
-	// The reflection is necessary for arrays and multidimensional slices,
-	// but it comes with a 20-50% performance penalty for large arrays/slices
-	value := reflect.ValueOf(dst)
-	if value.Kind() == reflect.Ptr {
-		value = value.Elem()
-	}
-
-	switch value.Kind() {
-	case reflect.Array, reflect.Slice:
-	default:
-		return fmt.Errorf("cannot assign %T to %T", src, dst)
-	}
-
-	if len(src.Elements) == 0 {
-		if value.Kind() == reflect.Slice {
-			value.Set(reflect.MakeSlice(value.Type(), 0, 0))
-			return nil
-		}
-	}
-
-	elementCount, err := src.assignToRecursive(value, 0, 0)
-	if err != nil {
-		return err
-	}
-	if elementCount != len(src.Elements) {
-		return fmt.Errorf("cannot assign %v, needed to assign %d elements, but only assigned %d", dst, len(src.Elements), elementCount)
-	}
-
-	return nil
-}
-
-func (src *DateArray) assignToRecursive(value reflect.Value, index, dimension int) (int, error) {
-	switch kind := value.Kind(); kind {
-	case reflect.Array:
-		fallthrough
-	case reflect.Slice:
-		if len(src.Dimensions) == dimension {
-			break
-		}
-
-		length := int(src.Dimensions[dimension].Length)
-		if reflect.Array == kind {
-			typ := value.Type()
-			if typ.Len() != length {
-				return 0, fmt.Errorf("expected size %d array, but %s has size %d array", length, typ, typ.Len())
-			}
-			value.Set(reflect.New(typ).Elem())
-		} else {
-			value.Set(reflect.MakeSlice(value.Type(), length, length))
-		}
-
-		var err error
-		for i := 0; i < length; i++ {
-			index, err = src.assignToRecursive(value.Index(i), index, dimension+1)
-			if err != nil {
-				return 0, err
-			}
-		}
-
-		return index, nil
-	}
-	if len(src.Dimensions) != dimension {
-		return 0, fmt.Errorf("incorrect dimensions, expected %d, found %d", len(src.Dimensions), dimension)
-	}
-	if !value.CanAddr() {
-		return 0, fmt.Errorf("cannot assign all values from DateArray")
-	}
-	addr := value.Addr()
-	if !addr.CanInterface() {
-		return 0, fmt.Errorf("cannot assign all values from DateArray")
-	}
-	if err := src.Elements[index].AssignTo(addr.Interface()); err != nil {
-		return 0, err
-	}
-	index++
-	return index, nil
-}
-
-func (dst *DateArray) DecodeText(ci *ConnInfo, src []byte) error {
-	if src == nil {
-		*dst = DateArray{}
-		return nil
-	}
-
-	uta, err := ParseUntypedTextArray(string(src))
-	if err != nil {
-		return err
-	}
-
-	var elements []Date
-
-	if len(uta.Elements) > 0 {
-		elements = make([]Date, len(uta.Elements))
-
-		for i, s := range uta.Elements {
-			var elem Date
-			var elemSrc []byte
-			if s != "NULL" || uta.Quoted[i] {
-				elemSrc = []byte(s)
-			}
-			err = elem.DecodeText(ci, elemSrc)
-			if err != nil {
-				return err
-			}
-
-			elements[i] = elem
-		}
-	}
-
-	*dst = DateArray{Elements: elements, Dimensions: uta.Dimensions, Valid: true}
-
-	return nil
-}
-
-func (dst *DateArray) DecodeBinary(ci *ConnInfo, src []byte) error {
-	if src == nil {
-		*dst = DateArray{}
-		return nil
-	}
-
-	var arrayHeader ArrayHeader
-	rp, err := arrayHeader.DecodeBinary(ci, src)
-	if err != nil {
-		return err
-	}
-
-	if len(arrayHeader.Dimensions) == 0 {
-		*dst = DateArray{Dimensions: arrayHeader.Dimensions, Valid: true}
-		return nil
-	}
-
-	elementCount := arrayHeader.Dimensions[0].Length
-	for _, d := range arrayHeader.Dimensions[1:] {
-		elementCount *= d.Length
-	}
-
-	elements := make([]Date, elementCount)
-
-	for i := range elements {
-		elemLen := int(int32(binary.BigEndian.Uint32(src[rp:])))
-		rp += 4
-		var elemSrc []byte
-		if elemLen >= 0 {
-			elemSrc = src[rp : rp+elemLen]
-			rp += elemLen
-		}
-		err = elements[i].DecodeBinary(ci, elemSrc)
-		if err != nil {
-			return err
-		}
-	}
-
-	*dst = DateArray{Elements: elements, Dimensions: arrayHeader.Dimensions, Valid: true}
-	return nil
-}
-
-func (src DateArray) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
-	if !src.Valid {
-		return nil, nil
-	}
-
-	if len(src.Dimensions) == 0 {
-		return append(buf, '{', '}'), nil
-	}
-
-	buf = EncodeTextArrayDimensions(buf, src.Dimensions)
-
-	// dimElemCounts is the multiples of elements that each array lies on. For
-	// example, a single dimension array of length 4 would have a dimElemCounts of
-	// [4]. A multi-dimensional array of lengths [3,5,2] would have a
-	// dimElemCounts of [30,10,2]. This is used to simplify when to render a '{'
-	// or '}'.
-	dimElemCounts := make([]int, len(src.Dimensions))
-	dimElemCounts[len(src.Dimensions)-1] = int(src.Dimensions[len(src.Dimensions)-1].Length)
-	for i := len(src.Dimensions) - 2; i > -1; i-- {
-		dimElemCounts[i] = int(src.Dimensions[i].Length) * dimElemCounts[i+1]
-	}
-
-	inElemBuf := make([]byte, 0, 32)
-	for i, elem := range src.Elements {
-		if i > 0 {
-			buf = append(buf, ',')
-		}
-
-		for _, dec := range dimElemCounts {
-			if i%dec == 0 {
-				buf = append(buf, '{')
-			}
-		}
-
-		elemBuf, err := elem.EncodeText(ci, inElemBuf)
-		if err != nil {
-			return nil, err
-		}
-		if elemBuf == nil {
-			buf = append(buf, `NULL`...)
-		} else {
-			buf = append(buf, QuoteArrayElementIfNeeded(string(elemBuf))...)
-		}
-
-		for _, dec := range dimElemCounts {
-			if (i+1)%dec == 0 {
-				buf = append(buf, '}')
-			}
-		}
-	}
-
-	return buf, nil
-}
-
-func (src DateArray) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
-	if !src.Valid {
-		return nil, nil
-	}
-
-	arrayHeader := ArrayHeader{
-		Dimensions: src.Dimensions,
-	}
-
-	if dt, ok := ci.DataTypeForName("date"); ok {
-		arrayHeader.ElementOID = int32(dt.OID)
-	} else {
-		return nil, fmt.Errorf("unable to find oid for type name %v", "date")
-	}
-
-	for i := range src.Elements {
-		if !src.Elements[i].Valid {
-			arrayHeader.ContainsNull = true
-			break
-		}
-	}
-
-	buf = arrayHeader.EncodeBinary(ci, buf)
-
-	for i := range src.Elements {
-		sp := len(buf)
-		buf = pgio.AppendInt32(buf, -1)
-
-		elemBuf, err := src.Elements[i].EncodeBinary(ci, buf)
-		if err != nil {
-			return nil, err
-		}
-		if elemBuf != nil {
-			buf = elemBuf
-			pgio.SetInt32(buf[sp:], int32(len(buf[sp:])-4))
-		}
-	}
-
-	return buf, nil
-}
-
-// Scan implements the database/sql Scanner interface.
-func (dst *DateArray) Scan(src interface{}) error {
-	if src == nil {
-		return dst.DecodeText(nil, nil)
-	}
-
-	switch src := src.(type) {
-	case string:
-		return dst.DecodeText(nil, []byte(src))
-	case []byte:
-		srcCopy := make([]byte, len(src))
-		copy(srcCopy, src)
-		return dst.DecodeText(nil, srcCopy)
-	}
-
-	return fmt.Errorf("cannot scan %T", src)
-}
-
-// Value implements the database/sql/driver Valuer interface.
-func (src DateArray) Value() (driver.Value, error) {
-	buf, err := src.EncodeText(nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	if buf == nil {
-		return nil, nil
-	}
-
-	return string(buf), nil
-}
diff --git a/pgtype/date_array_test.go b/pgtype/date_array_test.go
deleted file mode 100644
index 39ee32ce..00000000
--- a/pgtype/date_array_test.go
+++ /dev/null
@@ -1,327 +0,0 @@
-package pgtype_test
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgtype/testutil"
-)
-
-func TestDateArrayTranscode(t *testing.T) {
-	testutil.TestSuccessfulTranscode(t, "date[]", []interface{}{
-		&pgtype.DateArray{
-			Elements:   nil,
-			Dimensions: nil,
-			Valid:      true,
-		},
-		&pgtype.DateArray{
-			Elements: []pgtype.Date{
-				{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{},
-			},
-			Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}},
-			Valid:      true,
-		},
-		&pgtype.DateArray{},
-		&pgtype.DateArray{
-			Elements: []pgtype.Date{
-				{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2016, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2017, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{},
-				{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-			},
-			Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}},
-			Valid:      true,
-		},
-		&pgtype.DateArray{
-			Elements: []pgtype.Date{
-				{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2015, 2, 2, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2015, 2, 3, 0, 0, 0, 0, time.UTC), Valid: true},
-				{Time: time.Date(2015, 2, 4, 0, 0, 0, 0, time.UTC), Valid: true},
-			},
-			Dimensions: []pgtype.ArrayDimension{
-				{Length: 2, LowerBound: 4},
-				{Length: 2, LowerBound: 2},
-			},
-			Valid: true,
-		},
-	})
-}
-
-func TestDateArraySet(t *testing.T) {
-	successfulTests := []struct {
-		source interface{}
-		result pgtype.DateArray
-	}{
-		{
-			source: []time.Time{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-			result: pgtype.DateArray{
-				Elements:   []pgtype.Date{{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
-				Valid:      true},
-		},
-		{
-			source: (([]time.Time)(nil)),
-			result: pgtype.DateArray{},
-		},
-		{
-			source: [][]time.Time{
-				{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-				{time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC)}},
-			result: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
-				Valid:      true},
-		},
-		{
-			source: [][][][]time.Time{
-				{{{
-					time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC),
-					time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC),
-					time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC)}}},
-				{{{
-					time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC),
-					time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC),
-					time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC)}}}},
-			result: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{
-					{LowerBound: 1, Length: 2},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 3}},
-				Valid: true},
-		},
-		{
-			source: [2][1]time.Time{
-				{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-				{time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC)}},
-			result: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
-				Valid:      true},
-		},
-		{
-			source: [2][1][1][3]time.Time{
-				{{{
-					time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC),
-					time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC),
-					time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC)}}},
-				{{{
-					time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC),
-					time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC),
-					time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC)}}}},
-			result: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{
-					{LowerBound: 1, Length: 2},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 3}},
-				Valid: true},
-		},
-	}
-
-	for i, tt := range successfulTests {
-		var r pgtype.DateArray
-		err := r.Set(tt.source)
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-		}
-
-		if !reflect.DeepEqual(r, tt.result) {
-			t.Errorf("%d: expected %v to convert to %v, but it was %v", i, tt.source, tt.result, r)
-		}
-	}
-}
-
-func TestDateArrayAssignTo(t *testing.T) {
-	var timeSlice []time.Time
-	var timeSliceDim2 [][]time.Time
-	var timeSliceDim4 [][][][]time.Time
-	var timeArrayDim2 [2][1]time.Time
-	var timeArrayDim4 [2][1][1][3]time.Time
-
-	simpleTests := []struct {
-		src      pgtype.DateArray
-		dst      interface{}
-		expected interface{}
-	}{
-		{
-			src: pgtype.DateArray{
-				Elements:   []pgtype.Date{{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
-				Valid:      true,
-			},
-			dst:      &timeSlice,
-			expected: []time.Time{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-		},
-		{
-			src:      pgtype.DateArray{},
-			dst:      &timeSlice,
-			expected: (([]time.Time)(nil)),
-		},
-		{
-			src:      pgtype.DateArray{Valid: true},
-			dst:      &timeSlice,
-			expected: []time.Time{},
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
-				Valid:      true},
-			dst: &timeSliceDim2,
-			expected: [][]time.Time{
-				{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-				{time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC)}},
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{
-					{LowerBound: 1, Length: 2},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 3}},
-				Valid: true},
-			dst: &timeSliceDim4,
-			expected: [][][][]time.Time{
-				{{{
-					time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC),
-					time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC),
-					time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC)}}},
-				{{{
-					time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC),
-					time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC),
-					time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC)}}}},
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
-				Valid:      true},
-			dst: &timeArrayDim2,
-			expected: [2][1]time.Time{
-				{time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC)},
-				{time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC)}},
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{
-					{LowerBound: 1, Length: 2},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 1},
-					{LowerBound: 1, Length: 3}},
-				Valid: true},
-			dst: &timeArrayDim4,
-			expected: [2][1][1][3]time.Time{
-				{{{
-					time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC),
-					time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC),
-					time.Date(2017, 5, 6, 0, 0, 0, 0, time.UTC)}}},
-				{{{
-					time.Date(2018, 7, 8, 0, 0, 0, 0, time.UTC),
-					time.Date(2019, 9, 10, 0, 0, 0, 0, time.UTC),
-					time.Date(2020, 11, 12, 0, 0, 0, 0, time.UTC)}}}},
-		},
-	}
-
-	for i, tt := range simpleTests {
-		err := tt.src.AssignTo(tt.dst)
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-		}
-
-		if dst := reflect.ValueOf(tt.dst).Elem().Interface(); !reflect.DeepEqual(dst, tt.expected) {
-			t.Errorf("%d: expected %v to assign %v, but result was %v", i, tt.src, tt.expected, dst)
-		}
-	}
-
-	errorTests := []struct {
-		src pgtype.DateArray
-		dst interface{}
-	}{
-		{
-			src: pgtype.DateArray{
-				Elements:   []pgtype.Date{{}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
-				Valid:      true,
-			},
-			dst: &timeSlice,
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}, {LowerBound: 1, Length: 2}},
-				Valid:      true},
-			dst: &timeArrayDim2,
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}, {LowerBound: 1, Length: 2}},
-				Valid:      true},
-			dst: &timeSlice,
-		},
-		{
-			src: pgtype.DateArray{
-				Elements: []pgtype.Date{
-					{Time: time.Date(2015, 2, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-					{Time: time.Date(2016, 3, 4, 0, 0, 0, 0, time.UTC), Valid: true}},
-				Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
-				Valid:      true},
-			dst: &timeArrayDim4,
-		},
-	}
-
-	for i, tt := range errorTests {
-		err := tt.src.AssignTo(tt.dst)
-		if err == nil {
-			t.Errorf("%d: expected error but none was returned (%v -> %v)", i, tt.src, tt.dst)
-		}
-	}
-
-}
diff --git a/pgtype/date_test.go b/pgtype/date_test.go
index caccfc47..268759c1 100644
--- a/pgtype/date_test.go
+++ b/pgtype/date_test.go
@@ -1,123 +1,36 @@
 package pgtype_test
 
 import (
-	"reflect"
 	"testing"
 	"time"
 
 	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgtype/testutil"
 )
 
-func TestDateTranscode(t *testing.T) {
-	testutil.TestSuccessfulTranscodeEqFunc(t, "date", []interface{}{
-		&pgtype.Date{Time: time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{Time: time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{Time: time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{Time: time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{Time: time.Date(2000, 1, 2, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{Time: time.Date(2200, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true},
-		&pgtype.Date{},
-		&pgtype.Date{Valid: true, InfinityModifier: pgtype.Infinity},
-		&pgtype.Date{Valid: true, InfinityModifier: -pgtype.Infinity},
-	}, func(a, b interface{}) bool {
-		at := a.(pgtype.Date)
-		bt := b.(pgtype.Date)
+func isExpectedEqTime(a interface{}) func(interface{}) bool {
+	return func(v interface{}) bool {
+		at := a.(time.Time)
+		vt := v.(time.Time)
 
-		return at.Time.Equal(bt.Time) && at.Valid == bt.Valid && at.InfinityModifier == bt.InfinityModifier
+		return at.Equal(vt)
+	}
+}
+
+func TestDateCodec(t *testing.T) {
+	testPgxCodec(t, "date", []PgxTranscodeTestCase{
+		{time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC))},
+		{time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC))},
+		{time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC))},
+		{time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC))},
+		{time.Date(2000, 1, 2, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(2000, 1, 2, 0, 0, 0, 0, time.UTC))},
+		{time.Date(2200, 1, 1, 0, 0, 0, 0, time.UTC), new(time.Time), isExpectedEqTime(time.Date(2200, 1, 1, 0, 0, 0, 0, time.UTC))},
+		{pgtype.Date{InfinityModifier: pgtype.Infinity, Valid: true}, new(pgtype.Date), isExpectedEq(pgtype.Date{InfinityModifier: pgtype.Infinity, Valid: true})},
+		{pgtype.Date{InfinityModifier: pgtype.NegativeInfinity, Valid: true}, new(pgtype.Date), isExpectedEq(pgtype.Date{InfinityModifier: pgtype.NegativeInfinity, Valid: true})},
+		{pgtype.Date{}, new(pgtype.Date), isExpectedEq(pgtype.Date{})},
+		{nil, new(*time.Time), isExpectedEq((*time.Time)(nil))},
 	})
 }
 
-func TestDateSet(t *testing.T) {
-	type _time time.Time
-
-	successfulTests := []struct {
-		source interface{}
-		result pgtype.Date
-	}{
-		{source: time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: time.Date(2000, 1, 2, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(2000, 1, 2, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: time.Date(2200, 1, 1, 0, 0, 0, 0, time.UTC), result: pgtype.Date{Time: time.Date(2200, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: _time(time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)), result: pgtype.Date{Time: time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), Valid: true}},
-		{source: "1999-12-31", result: pgtype.Date{Time: time.Date(1999, 12, 31, 0, 0, 0, 0, time.UTC), Valid: true}},
-	}
-
-	for i, tt := range successfulTests {
-		var d pgtype.Date
-		err := d.Set(tt.source)
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-		}
-
-		if d != tt.result {
-			t.Errorf("%d: expected %v to convert to %v, but it was %v", i, tt.source, tt.result, d)
-		}
-	}
-}
-
-func TestDateAssignTo(t *testing.T) {
-	var tim time.Time
-	var ptim *time.Time
-
-	simpleTests := []struct {
-		src      pgtype.Date
-		dst      interface{}
-		expected interface{}
-	}{
-		{src: pgtype.Date{Time: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local), Valid: true}, dst: &tim, expected: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local)},
-		{src: pgtype.Date{Time: time.Time{}}, dst: &ptim, expected: ((*time.Time)(nil))},
-	}
-
-	for i, tt := range simpleTests {
-		err := tt.src.AssignTo(tt.dst)
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-		}
-
-		if dst := reflect.ValueOf(tt.dst).Elem().Interface(); dst != tt.expected {
-			t.Errorf("%d: expected %v to assign %v, but result was %v", i, tt.src, tt.expected, dst)
-		}
-	}
-
-	pointerAllocTests := []struct {
-		src      pgtype.Date
-		dst      interface{}
-		expected interface{}
-	}{
-		{src: pgtype.Date{Time: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local), Valid: true}, dst: &ptim, expected: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local)},
-	}
-
-	for i, tt := range pointerAllocTests {
-		err := tt.src.AssignTo(tt.dst)
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-		}
-
-		if dst := reflect.ValueOf(tt.dst).Elem().Elem().Interface(); dst != tt.expected {
-			t.Errorf("%d: expected %v to assign %v, but result was %v", i, tt.src, tt.expected, dst)
-		}
-	}
-
-	errorTests := []struct {
-		src pgtype.Date
-		dst interface{}
-	}{
-		{src: pgtype.Date{Time: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local), InfinityModifier: pgtype.Infinity, Valid: true}, dst: &tim},
-		{src: pgtype.Date{Time: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local), InfinityModifier: pgtype.NegativeInfinity, Valid: true}, dst: &tim},
-		{src: pgtype.Date{Time: time.Date(2015, 1, 1, 0, 0, 0, 0, time.Local)}, dst: &tim},
-	}
-
-	for i, tt := range errorTests {
-		err := tt.src.AssignTo(tt.dst)
-		if err == nil {
-			t.Errorf("%d: expected error but none was returned (%v -> %v)", i, tt.src, tt.dst)
-		}
-	}
-}
-
 func TestDateMarshalJSON(t *testing.T) {
 	successfulTests := []struct {
 		source pgtype.Date
diff --git a/pgtype/pgtype.go b/pgtype/pgtype.go
index bcc8828d..e48bec51 100644
--- a/pgtype/pgtype.go
+++ b/pgtype/pgtype.go
@@ -263,7 +263,7 @@ func NewConnInfo() *ConnInfo {
 	ci.RegisterDataType(DataType{Name: "_bpchar", OID: BPCharArrayOID, Codec: &ArrayCodec{ElementCodec: TextCodec{}, ElementOID: BPCharOID}})
 	ci.RegisterDataType(DataType{Name: "_bytea", OID: ByteaArrayOID, Codec: &ArrayCodec{ElementCodec: ByteaCodec{}, ElementOID: ByteaOID}})
 	ci.RegisterDataType(DataType{Value: &CIDRArray{}, Name: "_cidr", OID: CIDRArrayOID})
-	ci.RegisterDataType(DataType{Value: &DateArray{}, Name: "_date", OID: DateArrayOID})
+	ci.RegisterDataType(DataType{Name: "_date", OID: DateArrayOID, Codec: &ArrayCodec{ElementCodec: DateCodec{}, ElementOID: DateOID}})
 	ci.RegisterDataType(DataType{Value: &Float4Array{}, Name: "_float4", OID: Float4ArrayOID})
 	ci.RegisterDataType(DataType{Value: &Float8Array{}, Name: "_float8", OID: Float8ArrayOID})
 	ci.RegisterDataType(DataType{Value: &InetArray{}, Name: "_inet", OID: InetArrayOID})
@@ -295,7 +295,7 @@ func NewConnInfo() *ConnInfo {
 	ci.RegisterDataType(DataType{Name: "cid", OID: CIDOID, Codec: Uint32Codec{}})
 	ci.RegisterDataType(DataType{Value: &CIDR{}, Name: "cidr", OID: CIDROID})
 	ci.RegisterDataType(DataType{Name: "circle", OID: CircleOID, Codec: CircleCodec{}})
-	ci.RegisterDataType(DataType{Value: &Date{}, Name: "date", OID: DateOID})
+	ci.RegisterDataType(DataType{Name: "date", OID: DateOID, Codec: DateCodec{}})
 	// ci.RegisterDataType(DataType{Value: &Daterange{}, Name: "daterange", OID: DaterangeOID})
 	ci.RegisterDataType(DataType{Value: &Float4{}, Name: "float4", OID: Float4OID})
 	ci.RegisterDataType(DataType{Value: &Float8{}, Name: "float8", OID: Float8OID})
@@ -807,6 +807,30 @@ func tryUnderlyingTypeScanPlan(dst interface{}) (plan *underlyingTypeScanPlan, n
 	return nil, nil, false
 }
 
+type WrappedScanPlanNextSetter interface {
+	SetNext(ScanPlan)
+	ScanPlan
+}
+
+func tryWrapBuiltinTypeScanPlan(dst interface{}) (plan WrappedScanPlanNextSetter, nextDst interface{}, ok bool) {
+	switch dst := dst.(type) {
+	case *time.Time:
+		return &wrapTimeScanPlan{}, (*timeWrapper)(dst), true
+	}
+
+	return nil, nil, false
+}
+
+type wrapTimeScanPlan struct {
+	next ScanPlan
+}
+
+func (plan *wrapTimeScanPlan) SetNext(next ScanPlan) { plan.next = next }
+
+func (plan *wrapTimeScanPlan) Scan(ci *ConnInfo, oid uint32, formatCode int16, src []byte, dst interface{}) error {
+	return plan.next.Scan(ci, oid, formatCode, src, (*timeWrapper)(dst.(*time.Time)))
+}
+
 type pointerEmptyInterfaceScanPlan struct {
 	codec Codec
 }
@@ -903,6 +927,13 @@ func (ci *ConnInfo) PlanScan(oid uint32, formatCode int16, dst interface{}) Scan
 			}
 		}
 
+		if wrapperPlan, nextValue, ok := tryWrapBuiltinTypeScanPlan(dst); ok {
+			if nextPlan := ci.PlanScan(oid, formatCode, nextValue); nextPlan != nil {
+				wrapperPlan.SetNext(nextPlan)
+				return wrapperPlan
+			}
+		}
+
 		if _, ok := dst.(*interface{}); ok {
 			return &pointerEmptyInterfaceScanPlan{codec: dt.Codec}
 		}
@@ -1031,7 +1062,6 @@ func (ci *ConnInfo) PlanEncode(oid uint32, format int16, value interface{}) Enco
 				wrapperPlan.SetNext(nextPlan)
 				return wrapperPlan
 			}
-
 		}
 
 	}
@@ -1107,33 +1137,35 @@ type WrappedEncodePlanNextSetter interface {
 }
 
 func tryWrapBuiltinTypeEncodePlan(value interface{}) (plan WrappedEncodePlanNextSetter, nextValue interface{}, ok bool) {
-	switch value.(type) {
+	switch value := value.(type) {
 	case int8:
-		return &wrapInt8EncodePlan{}, int8Wrapper(value.(int8)), true
+		return &wrapInt8EncodePlan{}, int8Wrapper(value), true
 	case int16:
-		return &wrapInt16EncodePlan{}, int16Wrapper(value.(int16)), true
+		return &wrapInt16EncodePlan{}, int16Wrapper(value), true
 	case int32:
-		return &wrapInt32EncodePlan{}, int32Wrapper(value.(int32)), true
+		return &wrapInt32EncodePlan{}, int32Wrapper(value), true
 	case int64:
-		return &wrapInt64EncodePlan{}, int64Wrapper(value.(int64)), true
+		return &wrapInt64EncodePlan{}, int64Wrapper(value), true
 	case int:
-		return &wrapIntEncodePlan{}, intWrapper(value.(int)), true
+		return &wrapIntEncodePlan{}, intWrapper(value), true
 	case uint8:
-		return &wrapUint8EncodePlan{}, uint8Wrapper(value.(uint8)), true
+		return &wrapUint8EncodePlan{}, uint8Wrapper(value), true
 	case uint16:
-		return &wrapUint16EncodePlan{}, uint16Wrapper(value.(uint16)), true
+		return &wrapUint16EncodePlan{}, uint16Wrapper(value), true
 	case uint32:
-		return &wrapUint32EncodePlan{}, uint32Wrapper(value.(uint32)), true
+		return &wrapUint32EncodePlan{}, uint32Wrapper(value), true
 	case uint64:
-		return &wrapUint64EncodePlan{}, uint64Wrapper(value.(uint64)), true
+		return &wrapUint64EncodePlan{}, uint64Wrapper(value), true
 	case uint:
-		return &wrapUintEncodePlan{}, uintWrapper(value.(uint)), true
+		return &wrapUintEncodePlan{}, uintWrapper(value), true
 	case float32:
-		return &wrapFloat32EncodePlan{}, float32Wrapper(value.(float32)), true
+		return &wrapFloat32EncodePlan{}, float32Wrapper(value), true
 	case float64:
-		return &wrapFloat64EncodePlan{}, float64Wrapper(value.(float64)), true
+		return &wrapFloat64EncodePlan{}, float64Wrapper(value), true
 	case string:
-		return &wrapStringEncodePlan{}, stringWrapper(value.(string)), true
+		return &wrapStringEncodePlan{}, stringWrapper(value), true
+	case time.Time:
+		return &wrapTimeEncodePlan{}, timeWrapper(value), true
 	}
 
 	return nil, nil, false
@@ -1269,6 +1301,16 @@ func (plan *wrapStringEncodePlan) Encode(value interface{}, buf []byte) (newBuf
 	return plan.next.Encode(stringWrapper(value.(string)), buf)
 }
 
+type wrapTimeEncodePlan struct {
+	next EncodePlan
+}
+
+func (plan *wrapTimeEncodePlan) SetNext(next EncodePlan) { plan.next = next }
+
+func (plan *wrapTimeEncodePlan) Encode(value interface{}, buf []byte) (newBuf []byte, err error) {
+	return plan.next.Encode(timeWrapper(value.(time.Time)), buf)
+}
+
 // Encode appends the encoded bytes of value to buf. If value is the SQL value NULL then append nothing and return
 // (nil, nil). The caller of Encode is responsible for writing the correct NULL value or the length of the data
 // written.