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: filter duplicate ids when loading m2m edges

Browse Source
This commit is contained in:
Ariel Mashraki
2021-03-15 22:35:36 +02:00
committed by Ariel Mashraki
parent 6ab0d01ea4
commit e92dfee33f
31 changed files with 121 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/m2m2types/ent/group_query.go
View File

@@ -391,7 +391,6 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(group.UsersPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -410,7 +409,9 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/m2m2types/ent/user_query.go
View File

@@ -391,7 +391,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.GroupsPrimaryKey[1], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -410,7 +409,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/m2mbidi/ent/user_query.go
View File

@@ -390,7 +390,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.FriendsPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -409,7 +408,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

10
examples/m2mrecur/ent/user_query.go
View File

@@ -426,7 +426,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.FollowersPrimaryKey[1], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -445,7 +444,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},
@@ -490,7 +491,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.FollowingPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -509,7 +509,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/privacytenant/ent/group_query.go
View File

@@ -471,7 +471,6 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(group.UsersPrimaryKey[1], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -490,7 +489,9 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/privacytenant/ent/user_query.go
View File

@@ -471,7 +471,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.GroupsPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -490,7 +489,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/start/ent/group_query.go
View File

@@ -391,7 +391,6 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(group.UsersPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -410,7 +409,9 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/start/ent/user_query.go
View File

@@ -457,7 +457,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.GroupsPrimaryKey[1], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -476,7 +475,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/traversal/ent/group_query.go
View File

@@ -435,7 +435,6 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(group.UsersPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -454,7 +453,9 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

5
examples/traversal/ent/pet_query.go
View File

@@ -435,7 +435,6 @@ func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(pet.FriendsPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -454,7 +453,9 @@ func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},

10
examples/traversal/ent/user_query.go
View File

@@ -529,7 +529,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.FriendsPrimaryKey[0], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -548,7 +547,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},
@@ -593,7 +594,6 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
Predicate: func(s *sql.Selector) {
s.Where(sql.InValues(user.GroupsPrimaryKey[1], fks...))
},
ScanValues: func() [2]interface{} {
return [2]interface{}{&sql.NullInt64{}, &sql.NullInt64{}}
},
@@ -612,7 +612,9 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if !ok {
return fmt.Errorf("unexpected node id in edges: %v", outValue)
}
edgeids = append(edgeids, inValue)
if _, ok := edges[inValue]; !ok {
edgeids = append(edgeids, inValue)
}
edges[inValue] = append(edges[inValue], node)
return nil
},