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

schema/field: add DefaultFunc for numeric types and add support for it in entc (#1153)

Browse Source 
* entc/load: allow defaultfuncs on numeric types

* schema/field: add DefaultFunc on numeric types

* docs: document DefaultFunc better

* chore: update generated files

* pr: address issues

* docs: updates on faq, address requested changes
This commit is contained in:
Morgan
2021-01-10 13:05:45 +01:00
committed by GitHub
parent 727e41e357
commit e4cc63c411
8 changed files with 239 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entc/load/internal/bindata.go
View File

File diff suppressed because one or more lines are too long

2
entc/load/schema.go
View File

@@ -352,7 +352,7 @@ func (f *Field) addAnnotation(an schema.Annotation) {
}
func (f *Field) defaults() error {
if !f.Default || !f.Info.Numeric() {
if !f.Default || !f.Info.Numeric() || f.DefaultKind == reflect.Func {
return nil
}
n, ok := f.DefaultValue.(float64)

6
entc/load/schema_test.go
View File

@@ -263,6 +263,10 @@ func (WithDefaults) Fields() []ent.Field {
Default(true),
field.Time("updated_at").
UpdateDefault(time.Now),
// see issue #1146
field.Int("int_default_func").DefaultFunc(func() int {
return 1e9
}),
}
}
@@ -290,6 +294,8 @@ func TestMarshalDefaults(t *testing.T) {
require.True(t, schema.Fields[3].Default)
require.False(t, schema.Fields[4].Default)
require.True(t, schema.Fields[4].UpdateDefault)
require.True(t, schema.Fields[5].Default)
require.Equal(t, schema.Fields[5].DefaultKind, reflect.Func)
}
type TimeMixin struct {