util/types: address comments

pingcap · Sep 6, 2015 · 0054f81 · 0054f81 · qiuyesuifeng · Sep 6, 2015
1 parent be56437
commit 0054f81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/util/types/convert.go b/util/types/convert.go
@@ -139,13 +139,15 @@ func Convert(val interface{}, target *FieldType) (v interface{}, err error) { //
 		// TODO: check Flen
 		return x, nil
 	case mysql.TypeYear:
-		var intVal int64
-		var err error
+		var (
+			intVal int64
+			err    error
+		)
 		switch x := val.(type) {
 		case string:
 			intVal, err = StrToInt(x)
 		default:
-			intVal, err = ToInt64(val)
+			intVal, err = ToInt64(x)
 		}
 		if err != nil {
 			return InvConv(val, tp)

diff --git a/util/types/convert_test.go b/util/types/convert_test.go
@@ -154,7 +154,7 @@ func (s *testTypeConvertSuite) TestConvertType(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(v.(mysql.Decimal).String(), Equals, "3.14159")
 
-	// Fot TypeYear
+	// For TypeYear
 	ft = NewFieldType(mysql.TypeYear)
 	v, err = Convert("2015-11-11", ft)
 	c.Assert(err, IsNil)