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