golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

schema/field: relax signature of DefaultFunc for String()

Browse Source
This commit is contained in:
Travis Cline
2021-01-02 22:39:51 -08:00
parent 97c316b80a
commit 952a34c9c2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
schema/field/field.go
View File

@@ -213,7 +213,7 @@ func (b *stringBuilder) Default(s string) *stringBuilder {
// field.String("cuid").
// DefaultFunc(cuid.New)
//
func (b *stringBuilder) DefaultFunc(fn func() string) *stringBuilder {
func (b *stringBuilder) DefaultFunc(fn interface{}) *stringBuilder {
b.desc.Default = fn
return b
}
@@ -295,6 +295,13 @@ func (b *stringBuilder) Annotations(annotations ...schema.Annotation) *stringBui
// Descriptor implements the ent.Field interface by returning its descriptor.
func (b *stringBuilder) Descriptor() *Descriptor {
// If the Default is present and a function, check that it's signtaure is appropriate.
if b.desc.Default != nil {
typ := reflect.TypeOf(b.desc.Default)
if typ.Kind() == reflect.Func && (typ.NumIn() != 0 || typ.NumOut() != 1 || typ.Out(0).String() != b.desc.Info.String()) {
b.desc.Err = fmt.Errorf("expect type (func() %s) for default value", b.desc.Info)
}
}
return b.desc
}