util/convert: convert year handle case mysql.Time

zhaog · Sep 6, 2015 · 97ea35c · 97ea35c
1 parent 0054f81
commit 97ea35c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/util/types/convert.go b/util/types/convert.go
@@ -146,6 +146,8 @@ func Convert(val interface{}, target *FieldType) (v interface{}, err error) { //
 		switch x := val.(type) {
 		case string:
 			intVal, err = StrToInt(x)
+		case mysql.Time:
+			return int16(x.Year()), nil
 		default:
 			intVal, err = ToInt64(x)
 		}

diff --git a/util/types/convert_test.go b/util/types/convert_test.go
@@ -164,6 +164,10 @@ func (s *testTypeConvertSuite) TestConvertType(c *C) {
 	c.Assert(v, Equals, int16(2015))
 	v, err = Convert(1800, ft)
 	c.Assert(err, NotNil)
+	dt, err := mysql.ParseDate("2015-11-11")
+	c.Assert(err, IsNil)
+	v, err = Convert(dt, ft)
+	c.Assert(v, Equals, int16(2015))
 }
 
 func testToInt64(c *C, val interface{}, expect int64) {