Standardize receiver variable name for pgtype
Conversion functions now use standardized src and dst depending on their role.
This commit is contained in:
+29
-29
@@ -20,15 +20,15 @@ const (
|
||||
infinityDayOffset = 2147483647
|
||||
)
|
||||
|
||||
func (d *Date) ConvertFrom(src interface{}) error {
|
||||
func (dst *Date) ConvertFrom(src interface{}) error {
|
||||
switch value := src.(type) {
|
||||
case Date:
|
||||
*d = value
|
||||
*dst = value
|
||||
case time.Time:
|
||||
*d = Date{Time: value, Status: Present}
|
||||
*dst = Date{Time: value, Status: Present}
|
||||
default:
|
||||
if originalSrc, ok := underlyingTimeType(src); ok {
|
||||
return d.ConvertFrom(originalSrc)
|
||||
return dst.ConvertFrom(originalSrc)
|
||||
}
|
||||
return fmt.Errorf("cannot convert %v to Date", value)
|
||||
}
|
||||
@@ -36,20 +36,20 @@ func (d *Date) ConvertFrom(src interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *Date) AssignTo(dst interface{}) error {
|
||||
func (src *Date) AssignTo(dst interface{}) error {
|
||||
switch v := dst.(type) {
|
||||
case *time.Time:
|
||||
if d.Status != Present || d.InfinityModifier != None {
|
||||
return fmt.Errorf("cannot assign %v to %T", d, dst)
|
||||
if src.Status != Present || src.InfinityModifier != None {
|
||||
return fmt.Errorf("cannot assign %v to %T", src, dst)
|
||||
}
|
||||
*v = d.Time
|
||||
*v = src.Time
|
||||
default:
|
||||
if v := reflect.ValueOf(dst); v.Kind() == reflect.Ptr {
|
||||
el := v.Elem()
|
||||
switch el.Kind() {
|
||||
// if dst is a pointer to pointer, strip the pointer and try again
|
||||
case reflect.Ptr:
|
||||
if d.Status == Null {
|
||||
if src.Status == Null {
|
||||
if !el.IsNil() {
|
||||
// if the destination pointer is not nil, nil it out
|
||||
el.Set(reflect.Zero(el.Type()))
|
||||
@@ -60,23 +60,23 @@ func (d *Date) AssignTo(dst interface{}) error {
|
||||
// allocate destination
|
||||
el.Set(reflect.New(el.Type().Elem()))
|
||||
}
|
||||
return d.AssignTo(el.Interface())
|
||||
return src.AssignTo(el.Interface())
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("cannot decode %v into %T", d, dst)
|
||||
return fmt.Errorf("cannot decode %v into %T", src, dst)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *Date) DecodeText(r io.Reader) error {
|
||||
func (dst *Date) DecodeText(r io.Reader) error {
|
||||
size, err := pgio.ReadInt32(r)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if size == -1 {
|
||||
*d = Date{Status: Null}
|
||||
*dst = Date{Status: Null}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -89,29 +89,29 @@ func (d *Date) DecodeText(r io.Reader) error {
|
||||
sbuf := string(buf)
|
||||
switch sbuf {
|
||||
case "infinity":
|
||||
*d = Date{Status: Present, InfinityModifier: Infinity}
|
||||
*dst = Date{Status: Present, InfinityModifier: Infinity}
|
||||
case "-infinity":
|
||||
*d = Date{Status: Present, InfinityModifier: -Infinity}
|
||||
*dst = Date{Status: Present, InfinityModifier: -Infinity}
|
||||
default:
|
||||
t, err := time.ParseInLocation("2006-01-02", sbuf, time.UTC)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*d = Date{Time: t, Status: Present}
|
||||
*dst = Date{Time: t, Status: Present}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *Date) DecodeBinary(r io.Reader) error {
|
||||
func (dst *Date) DecodeBinary(r io.Reader) error {
|
||||
size, err := pgio.ReadInt32(r)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if size == -1 {
|
||||
*d = Date{Status: Null}
|
||||
*dst = Date{Status: Null}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -126,27 +126,27 @@ func (d *Date) DecodeBinary(r io.Reader) error {
|
||||
|
||||
switch dayOffset {
|
||||
case infinityDayOffset:
|
||||
*d = Date{Status: Present, InfinityModifier: Infinity}
|
||||
*dst = Date{Status: Present, InfinityModifier: Infinity}
|
||||
case negativeInfinityDayOffset:
|
||||
*d = Date{Status: Present, InfinityModifier: -Infinity}
|
||||
*dst = Date{Status: Present, InfinityModifier: -Infinity}
|
||||
default:
|
||||
t := time.Date(2000, 1, int(1+dayOffset), 0, 0, 0, 0, time.UTC)
|
||||
*d = Date{Time: t, Status: Present}
|
||||
*dst = Date{Time: t, Status: Present}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d Date) EncodeText(w io.Writer) error {
|
||||
if done, err := encodeNotPresent(w, d.Status); done {
|
||||
func (src Date) EncodeText(w io.Writer) error {
|
||||
if done, err := encodeNotPresent(w, src.Status); done {
|
||||
return err
|
||||
}
|
||||
|
||||
var s string
|
||||
|
||||
switch d.InfinityModifier {
|
||||
switch src.InfinityModifier {
|
||||
case None:
|
||||
s = d.Time.Format("2006-01-02")
|
||||
s = src.Time.Format("2006-01-02")
|
||||
case Infinity:
|
||||
s = "infinity"
|
||||
case NegativeInfinity:
|
||||
@@ -162,8 +162,8 @@ func (d Date) EncodeText(w io.Writer) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (d Date) EncodeBinary(w io.Writer) error {
|
||||
if done, err := encodeNotPresent(w, d.Status); done {
|
||||
func (src Date) EncodeBinary(w io.Writer) error {
|
||||
if done, err := encodeNotPresent(w, src.Status); done {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -173,9 +173,9 @@ func (d Date) EncodeBinary(w io.Writer) error {
|
||||
}
|
||||
|
||||
var daysSinceDateEpoch int32
|
||||
switch d.InfinityModifier {
|
||||
switch src.InfinityModifier {
|
||||
case None:
|
||||
tUnix := time.Date(d.Time.Year(), d.Time.Month(), d.Time.Day(), 0, 0, 0, 0, time.UTC).Unix()
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user