1
0
mirror of https://github.com/rancher/norman.git synced 2025-09-25 14:46:57 +00:00

Merge pull request #237 from aiwantaozi/fix-float

Add default value to float type
This commit is contained in:
Darren Shepherd
2018-12-17 15:43:08 -07:00
committed by GitHub

View File

@@ -289,7 +289,9 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
fieldType.Kind() == reflect.Uint32 ||
fieldType.Kind() == reflect.Int32 ||
fieldType.Kind() == reflect.Uint64 ||
fieldType.Kind() == reflect.Int64 {
fieldType.Kind() == reflect.Int64 ||
fieldType.Kind() == reflect.Float32 ||
fieldType.Kind() == reflect.Float64 {
schemaField.Nullable = false
schemaField.Default = 0
}
@@ -314,6 +316,12 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
return err
}
schemaField.Default = n
case "float":
n, err := convert.ToFloat(schemaField.Default)
if err != nil {
return err
}
schemaField.Default = n
case "boolean":
schemaField.Default = convert.ToBool(schemaField.Default)
}
@@ -446,6 +454,10 @@ func (s *Schemas) determineSchemaType(version *APIVersion, t reflect.Type) (stri
fallthrough
case reflect.Int64:
return "int", nil
case reflect.Float32:
fallthrough
case reflect.Float64:
return "float", nil
case reflect.Interface:
return "json", nil
case reflect.Map: