Merge branch 'master' into disksing/kv-refine-interfaces

mrunix · Dec 24, 2015 · d8fe27d · d8fe27d
2 parents 15a5e4f + 7212e11
commit d8fe27d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/util/types/field_type.go b/util/types/field_type.go
@@ -166,12 +166,14 @@ func DefaultTypeForValue(value interface{}) *FieldType {
 		tp := NewFieldType(mysql.TypeBlob)
 		tp.Charset = charset.CharsetBin
 		tp.Collate = charset.CharsetBin
+		return tp
 	case mysql.Bit:
 		return NewFieldType(mysql.TypeBit)
 	case mysql.Hex:
 		tp := NewFieldType(mysql.TypeVarchar)
 		tp.Charset = charset.CharsetBin
 		tp.Collate = charset.CharsetBin
+		return tp
 	case mysql.Time:
 		return NewFieldType(x.Type)
 	case mysql.Duration:

diff --git a/util/types/field_type_test.go b/util/types/field_type_test.go
@@ -118,3 +118,31 @@ func (s *testFieldTypeSuite) TestDataItem(c *check.C) {
 	c.Assert(RawData(d), check.Equals, "string")
 	c.Assert(IsNil(d), check.IsFalse)
 }
+
+func (s *testFieldTypeSuite) TestDefaultTypeForValue(c *check.C) {
+	nullType := DefaultTypeForValue(nil)
+	di := &DataItem{Type: nullType}
+	cases := []struct {
+		value interface{}
+		tp    byte
+	}{
+		{nil, mysql.TypeNull},
+		{1, mysql.TypeLonglong},
+		{uint64(1), mysql.TypeLonglong},
+		{"abc", mysql.TypeVarchar},
+		{1.1, mysql.TypeNewDecimal},
+		{[]byte("abc"), mysql.TypeBlob},
+		{mysql.Bit{}, mysql.TypeBit},
+		{mysql.Hex{}, mysql.TypeVarchar},
+		{mysql.Time{Type: mysql.TypeDatetime}, mysql.TypeDatetime},
+		{mysql.Duration{}, mysql.TypeDuration},
+		{mysql.Decimal{}, mysql.TypeNewDecimal},
+		{mysql.Enum{}, mysql.TypeEnum},
+		{mysql.Set{}, mysql.TypeSet},
+		{di, mysql.TypeNull},
+	}
+	for _, ca := range cases {
+		ft := DefaultTypeForValue(ca.value)
+		c.Assert(ft.Tp, check.Equals, ca.tp, check.Commentf("%v %v", ft, ca))
+	}
+}