fix types over wire

Author: James Cor

sql/types/bit.go

@@ -18,16 +18,13 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"reflect"
-	"strconv"
-
 	"github.com/dolthub/vitess/go/sqltypes"
 	"github.com/dolthub/vitess/go/vt/proto/query"
 	"github.com/shopspring/decimal"
 	"gopkg.in/src-d/go-errors.v1"
+	"reflect"
 
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/values"
 )
 
 const (
@@ -218,9 +215,27 @@ func (t BitType_) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltyp
 	if v.IsNull() {
 		return sqltypes.NULL, nil
 	}
-	// Assume this is uint64
-	x := values.ReadUint64(v.Val)
-	dest = strconv.AppendUint(dest, x, 10)
+
+	numBytes := t.numOfBits / 8
+	if t.numOfBits%8 != 0 {
+		numBytes += 1
+	}
+
+	if uint8(len(v.Val)) < numBytes {
+		// already in little endian, so just pad with trailing 0s
+		for i := uint8(len(v.Val)); i <= t.numOfBits/8; i++ {
+			v.Val = append(v.Val, 0)
+		}
+	} else {
+		v.Val = v.Val[:numBytes]
+	}
+
+	// TODO: for whatever reason, TestTypesOverWire only works when this is a deep copy?
+	dest = append(dest, v.Val...)
+	// want the results in big endian
+	for i, j := 0, len(dest)-1; i < j; i, j = i+1, j-1 {
+		dest[i], dest[j] = dest[j], dest[i]
+	}
 	return sqltypes.MakeTrusted(sqltypes.Bit, dest), nil
 }
 

sql/types/datetime.go

@@ -487,7 +487,7 @@ func (t datetimeType) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sq
 		m := (x & (255 << 8)) >> 8
 		d := x & 255
 		t := time.Date(int(y), time.Month(m), int(d), 0, 0, 0, 0, time.UTC)
-		dest = t.AppendFormat(dest, sql.TimestampDatetimeLayout)
+		dest = t.AppendFormat(dest, sql.DateLayout)
 
 	case sqltypes.Datetime, sqltypes.Timestamp:
 		x := values.ReadInt64(v.Val)

sql/types/decimal.go

@@ -17,6 +17,7 @@ package types
 import (
 	"context"
 	"fmt"
+	"github.com/dolthub/go-mysql-server/sql/values"
 	"math/big"
 	"reflect"
 	"strings"
@@ -329,6 +330,22 @@ func (t DecimalType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltype
 	return sqltypes.MakeTrusted(sqltypes.Decimal, val), nil
 }
 
+func (t DecimalType_) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqltypes.Value, error) {
+	if v.IsNull() {
+		return sqltypes.NULL, nil
+	}
+	// TODO: implement values.ReadDecimal
+	e := values.ReadInt32(v.Val[:values.Int32Size])
+	s := values.ReadInt8(v.Val[values.Int32Size : values.Int32Size+values.Int8Size])
+	b := big.NewInt(0).SetBytes(v.Val[values.Int32Size+values.Int8Size:])
+	if s < 0 {
+		b = b.Neg(b)
+	}
+	d := decimal.NewFromBigInt(b, e)
+	val := AppendAndSliceString(dest, t.DecimalValueStringFixed(d))
+	return sqltypes.MakeTrusted(sqltypes.Decimal, val), nil
+}
+
 // String implements Type interface.
 func (t DecimalType_) String() string {
 	return fmt.Sprintf("decimal(%v,%v)", t.precision, t.scale)

sql/types/year.go

@@ -176,7 +176,7 @@ func (t YearType_) ToSQLValue(ctx *sql.Context, v sql.Value, dest []byte) (sqlty
 	if v.IsNull() {
 		return sqltypes.NULL, nil
 	}
-	x := values.ReadUint8(v.Val)
+	x := values.ReadUint16(v.Val)
 	dest = strconv.AppendInt(dest, int64(x), 10)
 	return sqltypes.MakeTrusted(sqltypes.Year, dest), nil
 }

sql/values/encoding.go

@@ -131,17 +131,13 @@ func ReadUint16(val []byte) uint16 {
 
 func ReadInt24(val []byte) (i int32) {
 	expectSize(val, Int32Size)
-	i = int32(binary.LittleEndian.Uint32([]byte{0, val[0], val[1], val[2]}))
+	i = int32(binary.LittleEndian.Uint32(val))
 	return
 }
 
 func ReadUint24(val []byte) (u uint32) {
 	expectSize(val, Int32Size)
-	var tmp [4]byte
-	// copy |val| to |tmp|
-	tmp[3], tmp[2] = val[3], val[2]
-	tmp[1], tmp[0] = val[1], val[0]
-	u = binary.LittleEndian.Uint32(tmp[:])
+	u = binary.LittleEndian.Uint32(val)
 	return
 }