custom AppendDateFormat (#3322)

Author: jycor

sql/types/datetime.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"math"
 	"reflect"
+	"strconv"
 	"time"
 	"unicode"
 
@@ -452,59 +453,85 @@ func (t datetimeType) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltype
 		return sqltypes.Value{}, err
 	}
 
-	var typ query.Type
-	var val []byte
-
 	switch t.baseType {
 	case sqltypes.Date:
-		typ = sqltypes.Date
 		if vt.Equal(ZeroTime) {
-			val = vt.AppendFormat(dest, ZeroDateStr)
+			dest = append(dest, ZeroDateStr...)
 		} else {
-			val = vt.AppendFormat(dest, sql.DateLayout)
+			dest = appendDateFormat(dest, vt)
 		}
-	case sqltypes.Datetime:
-		typ = sqltypes.Datetime
-		if vt.Equal(ZeroTime) {
-			val = vt.AppendFormat(dest, ZeroTimestampDatetimeStr)
-		} else {
-			val = vt.AppendFormat(dest, sql.TimestampDatetimeLayout)
-		}
-	case sqltypes.Timestamp:
-		typ = sqltypes.Timestamp
+	case sqltypes.Datetime, sqltypes.Timestamp:
 		if vt.Equal(ZeroTime) {
-			val = vt.AppendFormat(dest, ZeroTimestampDatetimeStr)
+			dest = append(dest, ZeroTimestampDatetimeStr...)
 		} else {
-			val = vt.AppendFormat(dest, sql.TimestampDatetimeLayout)
+			dest = appendDatetimeFormat(dest, vt)
 		}
 	default:
 		return sqltypes.Value{}, sql.ErrInvalidBaseType.New(t.baseType.String(), "datetime")
 	}
 
-	valBytes := val
-
-	return sqltypes.MakeTrusted(typ, valBytes), nil
+	return sqltypes.MakeTrusted(t.baseType, dest), nil
 }
 
 // SQLValue implements the ValueType interface.
 func (t datetimeType) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
 	if v.IsNull() {
 		return sqltypes.NULL, nil
 	}
+
 	switch t.baseType {
 	case sqltypes.Date:
-		t := values.ReadDate(v.Val)
-		dest = t.AppendFormat(dest, sql.DateLayout)
+		vt := values.ReadDate(v.Val)
+		if vt.Equal(ZeroTime) {
+			dest = append(dest, ZeroDateStr...)
+		} else {
+			dest = appendDateFormat(dest, vt)
+		}
 	case sqltypes.Datetime, sqltypes.Timestamp:
 		x := values.ReadInt64(v.Val)
-		t := time.UnixMicro(x).UTC()
-		dest = t.AppendFormat(dest, sql.TimestampDatetimeLayout)
+		vt := time.UnixMicro(x).UTC()
+		if vt.Equal(ZeroTime) {
+			dest = append(dest, ZeroTimestampDatetimeStr...)
+		} else {
+			dest = appendDatetimeFormat(dest, vt)
+		}
 	default:
 		return sqltypes.Value{}, sql.ErrInvalidBaseType.New(t.baseType.String(), "datetime")
 	}
 	return sqltypes.MakeTrusted(t.baseType, dest), nil
 }
 
+func appendDateFormat(dest []byte, t time.Time) []byte {
+	year := t.Year()
+	if year == 0 {
+		dest = append(dest, '0', '0', '0', '0')
+	} else {
+		dest = strconv.AppendInt(dest, int64(year), 10)
+	}
+	dest = append(dest, '-')
+
+	month := int64(t.Month())
+	if month < 10 {
+		dest = append(dest, '0')
+	}
+	dest = strconv.AppendInt(dest, month, 10)
+	dest = append(dest, '-')
+
+	day := int64(t.Day())
+	if day < 10 {
+		dest = append(dest, '0')
+	}
+	dest = strconv.AppendInt(dest, day, 10)
+	return dest
+}
+
+func appendDatetimeFormat(dest []byte, t time.Time) []byte {
+	dest = appendDateFormat(dest, t)
+	dest = append(dest, ' ')
+	dest = appendTimeFormat(dest, int64(t.Hour()), int64(t.Minute()), int64(t.Second()), int64(t.Nanosecond()/1000))
+	return dest
+}
+
 func (t datetimeType) String() string {
 	switch t.baseType {
 	case sqltypes.Date:

sql/types/time.go

@@ -264,20 +264,22 @@ func (t TimespanType_) SQL(_ *sql.Context, dest []byte, v interface{}) (sqltypes
 	if v == nil {
 		return sqltypes.NULL, nil
 	}
+
 	ti, err := t.ConvertToTimespan(v)
 	if err != nil {
 		return sqltypes.Value{}, err
 	}
 
-	val := ti.Bytes()
-	return sqltypes.MakeTrusted(sqltypes.Time, val), nil
+	dest = ti.AppendBytes(dest)
+	return sqltypes.MakeTrusted(sqltypes.Time, dest), nil
 }
 
 // SQLValue implements ValueType interface.
 func (t TimespanType_) SQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
 	if v.IsNull() {
 		return sqltypes.NULL, nil
 	}
+
 	x := values.ReadInt64(v.Val)
 	dest = Timespan(x).AppendBytes(dest)
 	return sqltypes.MakeTrusted(sqltypes.Time, dest), nil
@@ -502,39 +504,40 @@ func (t Timespan) Bytes() []byte {
 }
 
 func (t Timespan) AppendBytes(dest []byte) []byte {
-	isNegative, hours, minutes, seconds, microseconds := t.timespanToUnits()
-	sz := 10
-	if microseconds > 0 {
-		sz += 7
-	}
-	if isNegative {
+	isNeg, h, m, s, ms := t.timespanToUnits()
+	if isNeg {
 		dest = append(dest, '-')
 	}
+	dest = appendTimeFormat(dest, int64(h), int64(m), int64(s), int64(ms))
+	return dest
+}
 
-	if hours < 10 {
+func appendTimeFormat(dest []byte, h, m, s, ms int64) []byte {
+	if h < 10 {
 		dest = append(dest, '0')
 	}
-	dest = strconv.AppendInt(dest, int64(hours), 10)
+	dest = strconv.AppendInt(dest, h, 10)
 	dest = append(dest, ':')
 
-	if minutes < 10 {
+	if m < 10 {
 		dest = append(dest, '0')
 	}
-	dest = strconv.AppendInt(dest, int64(minutes), 10)
+	dest = strconv.AppendInt(dest, m, 10)
 	dest = append(dest, ':')
 
-	if seconds < 10 {
+	if s < 10 {
 		dest = append(dest, '0')
 	}
-	dest = strconv.AppendInt(dest, int64(seconds), 10)
-	if microseconds > 0 {
+	dest = strconv.AppendInt(dest, s, 10)
+
+	if ms > 0 {
 		dest = append(dest, '.')
-		cmp := int32(100000)
-		for cmp > 0 && microseconds < cmp {
+		cmp := int64(100000)
+		for cmp > 0 && ms < cmp {
 			dest = append(dest, '0')
 			cmp /= 10
 		}
-		dest = strconv.AppendInt(dest, int64(microseconds), 10)
+		dest = strconv.AppendInt(dest, ms, 10)
 	}
 	return dest
 }