Commit 272d9bc6 authored by Elmar Ritsch's avatar Elmar Ritsch

Parse booleans and null as string values with --set-string flag

parent 1c259297
...@@ -325,6 +325,11 @@ func inMap(k rune, m map[rune]bool) bool { ...@@ -325,6 +325,11 @@ func inMap(k rune, m map[rune]bool) bool {
func typedVal(v []rune, st bool) interface{} { func typedVal(v []rune, st bool) interface{} {
val := string(v) val := string(v)
if st {
return val
}
if strings.EqualFold(val, "true") { if strings.EqualFold(val, "true") {
return true return true
} }
...@@ -337,8 +342,8 @@ func typedVal(v []rune, st bool) interface{} { ...@@ -337,8 +342,8 @@ func typedVal(v []rune, st bool) interface{} {
return nil return nil
} }
// If this value does not start with zero, and not returnString, try parsing it to an int // If this value does not start with zero, try parsing it to an int
if !st && len(val) != 0 && val[0] != '0' { if len(val) != 0 && val[0] != '0' {
if iv, err := strconv.ParseInt(val, 10, 64); err == nil { if iv, err := strconv.ParseInt(val, 10, 64); err == nil {
return iv return iv
} }
......
...@@ -75,6 +75,11 @@ func TestParseSet(t *testing.T) { ...@@ -75,6 +75,11 @@ func TestParseSet(t *testing.T) {
expect: map[string]interface{}{"long_int_string": "1234567890"}, expect: map[string]interface{}{"long_int_string": "1234567890"},
err: false, err: false,
}, },
{
str: "boolean=true",
expect: map[string]interface{}{"boolean": "true"},
err: false,
},
} }
tests := []struct { tests := []struct {
str string str string
...@@ -117,6 +122,10 @@ func TestParseSet(t *testing.T) { ...@@ -117,6 +122,10 @@ func TestParseSet(t *testing.T) {
str: "long_int=1234567890", str: "long_int=1234567890",
expect: map[string]interface{}{"long_int": 1234567890}, expect: map[string]interface{}{"long_int": 1234567890},
}, },
{
str: "boolean=true",
expect: map[string]interface{}{"boolean": true},
},
{ {
str: "name1,name2=", str: "name1,name2=",
err: true, err: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment