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

entc/gen: reject edge with mismatch type for back-ref

Browse Source 
Reviewed By: alexsn

Differential Revision: D17260642

fbshipit-source-id: ef25dc77d9e4a7986e86d859f4f776fcf34336c9
This commit is contained in:
Ariel Mashraki
2019-09-10 05:59:04 -07:00
committed by Facebook Github Bot
parent d820361a3a
commit 2cc229eeb2
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
entc/gen/graph.go
View File

@@ -59,7 +59,7 @@ func NewGraph(c Config, schemas ...*load.Schema) (g *Graph, err error) {
g.addEdges(schema)
}
for _, t := range g.Nodes {
check(g.resolve(t), "resolve %q relations/references", t.Name)
check(g.resolve(t), "resolve %q relations", t.Name)
}
for _, schema := range schemas {
g.addIndexes(schema)
@@ -136,7 +136,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
})
// inverse only.
case e.Inverse && e.Ref == nil:
expect(e.RefName != "", `missing reference name for inverse edge: %s.%s`, t.Name, e.Name)
expect(e.RefName != "", "missing reference name for inverse edge: %s.%s", t.Name, e.Name)
t.Edges = append(t.Edges, &Edge{
Type: typ,
Name: e.Name,
@@ -148,7 +148,7 @@ func (g *Graph) addEdges(schema *load.Schema) {
// inverse and assoc.
case e.Inverse:
ref := e.Ref
expect(e.RefName == "", `reference name is derived from the assoc name: %s.%s <-> %s.%s`, t.Name, ref.Name, t.Name, e.Name)
expect(e.RefName == "", "reference name is derived from the assoc name: %s.%s <-> %s.%s", t.Name, ref.Name, t.Name, e.Name)
expect(ref.Type == t.Name, "assoc-inverse edge allowed only as o2o relation of the same type")
t.Edges = append(t.Edges, &Edge{
Type: typ,
@@ -198,10 +198,13 @@ func (g *Graph) resolve(t *Type) error {
case e.IsInverse():
ref, ok := e.Type.HasAssoc(e.Inverse)
if !ok {
return fmt.Errorf(`edge is missing for inverse edge: %s.%s`, e.Type.Name, e.Name)
return fmt.Errorf("edge is missing for inverse edge: %s.%s", e.Type.Name, e.Name)
}
if !e.Optional && !ref.Optional {
return fmt.Errorf(`edges cannot be required in both directions: %s.%s <-> %s.%s`, t.Name, e.Name, ref.Type.Name, ref.Name)
return fmt.Errorf("edges cannot be required in both directions: %s.%s <-> %s.%s", t.Name, e.Name, e.Type.Name, ref.Name)
}
if ref.Type != t {
return fmt.Errorf("mismatch type for back-ref %q of %s.%s <-> %s.%s", e.Inverse, t.Name, e.Name, e.Type.Name, ref.Name)
}
table := t.Table()
// The name of the column is how we identify the other side. For example "A Parent has Children"

24
entc/gen/graph_test.go
View File

@@ -145,6 +145,30 @@ func TestNewGraphRequiredLoop(t *testing.T) {
require.Error(t, err, "require loop")
}
func TestNewGraphBadInverse(t *testing.T) {
_, err := NewGraph(Config{Package: "entc/gen", Storage: drivers},
&load.Schema{
Name: "User",
Edges: []*load.Edge{
{Name: "pets", Type: "Pet"},
{Name: "groups", Type: "Group"},
},
},
&load.Schema{
Name: "Pet",
Edges: []*load.Edge{
{Name: "owner", Type: "User", Unique: true, Required: true, RefName: "pets", Inverse: true},
},
},
&load.Schema{
Name: "Group",
Edges: []*load.Edge{
{Name: "users", Type: "User", RefName: "pets", Inverse: true},
},
})
require.Errorf(t, err, "mismatch type for back-reference")
}
func TestRelation(t *testing.T) {
require := require.New(t)
_, err := NewGraph(Config{Package: "entc/gen", Storage: drivers}, T1)