Change codecs to convert between numbers and bools (#244)

GODRIVER-1357
GODRIVER-1358
GODRIVER-1359
GODRIVER-1360

Author: iwysiu

bson/bsoncodec/default_value_decoders.go

@@ -105,16 +105,41 @@ func (dvd DefaultValueDecoders) RegisterDefaultDecoders(rb *RegistryBuilder) {
 
 // BooleanDecodeValue is the ValueDecoderFunc for bool types.
 func (dvd DefaultValueDecoders) BooleanDecodeValue(dctx DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if vr.Type() != bsontype.Boolean {
-		return fmt.Errorf("cannot decode %v into a boolean", vr.Type())
-	}
 	if !val.IsValid() || !val.CanSet() || val.Kind() != reflect.Bool {
 		return ValueDecoderError{Name: "BooleanDecodeValue", Kinds: []reflect.Kind{reflect.Bool}, Received: val}
 	}
 
-	b, err := vr.ReadBoolean()
+	var b bool
+	var err error
+	switch vr.Type() {
+	case bsontype.Int32:
+		i32, err := vr.ReadInt32()
+		if err != nil {
+			return err
+		}
+		b = (i32 != 0)
+	case bsontype.Int64:
+		i64, err := vr.ReadInt64()
+		if err != nil {
+			return err
+		}
+		b = (i64 != 0)
+	case bsontype.Double:
+		f64, err := vr.ReadDouble()
+		if err != nil {
+			return err
+		}
+		b = (f64 != 0)
+	case bsontype.Boolean:
+		b, err = vr.ReadBoolean()
+		if err != nil {
+			return err
+		}
+	default:
+		return fmt.Errorf("cannot decode %v into a boolean", vr.Type())
+	}
 	val.SetBool(b)
-	return err
+	return nil
 }
 
 // IntDecodeValue is the ValueDecoderFunc for int types.
@@ -145,6 +170,14 @@ func (dvd DefaultValueDecoders) IntDecodeValue(dc DecodeContext, vr bsonrw.Value
 			return fmt.Errorf("%g overflows int64", f64)
 		}
 		i64 = int64(f64)
+	case bsontype.Boolean:
+		b, err := vr.ReadBoolean()
+		if err != nil {
+			return err
+		}
+		if b {
+			i64 = 1
+		}
 	default:
 		return fmt.Errorf("cannot decode %v into an integer type", vr.Type())
 	}
@@ -215,6 +248,14 @@ func (dvd DefaultValueDecoders) UintDecodeValue(dc DecodeContext, vr bsonrw.Valu
 			return fmt.Errorf("%g overflows int64", f64)
 		}
 		i64 = int64(f64)
+	case bsontype.Boolean:
+		b, err := vr.ReadBoolean()
+		if err != nil {
+			return err
+		}
+		if b {
+			i64 = 1
+		}
 	default:
 		return fmt.Errorf("cannot decode %v into an integer type", vr.Type())
 	}
@@ -282,6 +323,14 @@ func (dvd DefaultValueDecoders) FloatDecodeValue(ec DecodeContext, vr bsonrw.Val
 		if err != nil {
 			return err
 		}
+	case bsontype.Boolean:
+		b, err := vr.ReadBoolean()
+		if err != nil {
+			return err
+		}
+		if b {
+			f = 1
+		}
 	default:
 		return fmt.Errorf("cannot decode %v into a float32 or float64 type", vr.Type())
 	}
@@ -555,7 +604,7 @@ func (dvd DefaultValueDecoders) JSONNumberDecodeValue(dc DecodeContext, vr bsonr
 		if err != nil {
 			return err
 		}
-		val.Set(reflect.ValueOf(json.Number(strconv.FormatFloat(f64, 'g', -1, 64))))
+		val.Set(reflect.ValueOf(json.Number(strconv.FormatFloat(f64, 'f', -1, 64))))
 	case bsontype.Int32:
 		i32, err := vr.ReadInt32()
 		if err != nil {

bson/mgocompat/bson_test.go

@@ -1334,19 +1334,19 @@ var twoWayCrossItems = []crossTypeItem{
 	{&struct{ I int }{42}, &struct{ I float64 }{42}},
 
 	// int <=> bool
-	// {&struct{ I int }{1}, &struct{ I bool }{true}},
-	// {&struct{ I int }{0}, &struct{ I bool }{false}},
+	{&struct{ I int }{1}, &struct{ I bool }{true}},
+	{&struct{ I int }{0}, &struct{ I bool }{false}},
 
 	// uint <=> float64
 	{&struct{ I uint }{42}, &struct{ I float64 }{42}},
 
 	// uint <=> bool
-	// {&struct{ I uint }{1}, &struct{ I bool }{true}},
-	// {&struct{ I uint }{0}, &struct{ I bool }{false}},
+	{&struct{ I uint }{1}, &struct{ I bool }{true}},
+	{&struct{ I uint }{0}, &struct{ I bool }{false}},
 
 	// float64 <=> bool
-	// {&struct{ I float64 }{1}, &struct{ I bool }{true}},
-	// {&struct{ I float64 }{0}, &struct{ I bool }{false}},
+	{&struct{ I float64 }{1}, &struct{ I bool }{true}},
+	{&struct{ I float64 }{0}, &struct{ I bool }{false}},
 
 	// string <=> string and string <=> []byte
 	// {&struct{ S []byte }{[]byte("abc")}, &struct{ S string }{"abc"}},
@@ -1366,17 +1366,17 @@ var twoWayCrossItems = []crossTypeItem{
 	// {&struct{ A []byte }{[]byte("abc")}, map[string]string{"a": "abc"}},
 	{&struct{ A uint }{42}, map[string]int{"a": 42}},
 	{&struct{ A uint }{42}, map[string]float64{"a": 42}},
-	// {&struct{ A uint }{1}, map[string]bool{"a": true}},
+	{&struct{ A uint }{1}, map[string]bool{"a": true}},
 	{&struct{ A int }{42}, map[string]uint{"a": 42}},
 	{&struct{ A int }{42}, map[string]float64{"a": 42}},
-	// {&struct{ A int }{1}, map[string]bool{"a": true}},
+	{&struct{ A int }{1}, map[string]bool{"a": true}},
 	{&struct{ A float64 }{42}, map[string]float32{"a": 42}},
 	{&struct{ A float64 }{42}, map[string]int{"a": 42}},
 	{&struct{ A float64 }{42}, map[string]uint{"a": 42}},
-	// {&struct{ A float64 }{1}, map[string]bool{"a": true}},
-	// {&struct{ A bool }{true}, map[string]int{"a": 1}},
-	// {&struct{ A bool }{true}, map[string]uint{"a": 1}},
-	// {&struct{ A bool }{true}, map[string]float64{"a": 1}},
+	{&struct{ A float64 }{1}, map[string]bool{"a": true}},
+	{&struct{ A bool }{true}, map[string]int{"a": 1}},
+	{&struct{ A bool }{true}, map[string]uint{"a": 1}},
+	{&struct{ A bool }{true}, map[string]float64{"a": 1}},
 	{&struct{ A **byte }{&byteptr}, map[string]byte{"a": 8}},
 
 	// url.URL <=> string
@@ -1483,7 +1483,7 @@ var twoWayCrossItems = []crossTypeItem{
 	// json.Number <=> int64, float64
 	{&struct{ N json.Number }{"5"}, map[string]interface{}{"n": int64(5)}},
 	{&struct{ N json.Number }{"5.05"}, map[string]interface{}{"n": 5.05}},
-	// {&struct{ N json.Number }{"9223372036854776000"}, map[string]interface{}{"n": float64(1 << 63)}},
+	{&struct{ N json.Number }{"9223372036854776000"}, map[string]interface{}{"n": float64(1 << 63)}},
 
 	// bson.D <=> non-struct getter/setter
 	// {&bson.D{{"a", 1}}, &getterSetterD{{"a", 1}, {"suffix", true}}},