Merge pull request #5788 from MordFustang21/master

vitessdriver: convert sqltypes.Timestamp to time.Time values

go/vt/vitessdriver/convert.go

@@ -31,7 +31,7 @@ type converter struct {
 
 func (cv *converter) ToNative(v sqltypes.Value) (interface{}, error) {
 	switch v.Type() {
-	case sqltypes.Datetime:
+	case sqltypes.Datetime, sqltypes.Timestamp:
 		return DatetimeToNative(v, cv.location)
 	case sqltypes.Date:
 		return DateToNative(v, cv.location)

go/vt/vitessdriver/convert_test.go

@@ -40,7 +40,7 @@ func TestToNative(t *testing.T) {
 	}, {
 		convert: &converter{},
 		in:      sqltypes.TestValue(sqltypes.Timestamp, "2012-02-24 23:19:43"),
-		out:     []byte("2012-02-24 23:19:43"), // TIMESTAMP is not handled
+		out:     time.Date(2012, 02, 24, 23, 19, 43, 0, time.UTC),
 	}, {
 		convert: &converter{},
 		in:      sqltypes.TestValue(sqltypes.Time, "23:19:43"),