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

ent/field: force optional on nillable field

Browse Source 
Reviewed By: alexsn

Differential Revision: D16757719

fbshipit-source-id: 813e10b8b4b1744e7ab68f4513722f66911cdef3
This commit is contained in:
Ariel Mashraki
2019-08-11 08:40:44 -07:00
committed by Facebook Github Bot
parent 71725de3d7
commit f2411742ae
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
entc/gen/graph_test.go
View File

@@ -17,7 +17,7 @@ var (
Name: "T1",
Fields: []*load.Field{
{Name: "age", Type: field.TypeInt, Optional: true},
{Name: "expired_at", Type: field.TypeTime, Nillable: true},
{Name: "expired_at", Type: field.TypeTime, Nillable: true, Optional: true},
{Name: "name", Type: field.TypeString, Default: true},
},
Edges: []*load.Edge{
@@ -77,7 +77,7 @@ func TestNewGraph(t *testing.T) {
for i, typ := range []string{"int", "time.Time", "string"} {
require.Equal(typ, t1.Fields[i].Type.String())
}
for i, optional := range []bool{true, false, false} {
for i, optional := range []bool{true, true, false} {
require.Equal(optional, t1.Fields[i].Optional)
}
for i, nullable := range []bool{false, true, false} {
@@ -157,7 +157,7 @@ func TestGraph_Gen(t *testing.T) {
Name: "T1",
Fields: []*load.Field{
{Name: "age", Type: field.TypeInt, Optional: true},
{Name: "expired_at", Type: field.TypeTime, Nillable: true},
{Name: "expired_at", Type: field.TypeTime, Nillable: true, Optional: true},
{Name: "name", Type: field.TypeString},
},
Edges: []*load.Edge{

3
entc/gen/type.go
View File

@@ -110,6 +110,9 @@ func NewType(c Config, schema *load.Schema) (*Type, error) {
if !f.Type.Valid() {
return nil, fmt.Errorf("invalid type for field %s", f.Name)
}
if f.Nillable && !f.Optional {
return nil, fmt.Errorf("nillable field %q must be optional", f.Name)
}
typ.Fields = append(typ.Fields, &Field{
def: f,
Name: f.Name,

2
entc/load/bindata.go
View File

@@ -102,7 +102,7 @@ func schemaGo() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "schema.go", size: 2637, mode: os.FileMode(420), modTime: time.Unix(1565179921, 0)}
info := bindataFileInfo{name: "schema.go", size: 2637, mode: os.FileMode(420), modTime: time.Unix(1565536164, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}