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

entc/gen/eagerloading: ignore loading edges on empty result (#298)

Browse Source 
* fix eagerloading

while parent nodes is zero.

* Update entc/gen/template/dialect/sql/query.tmpl

Co-Authored-By: Ariel Mashraki <7413593+a8m@users.noreply.github.com>

* Update entc/gen/template/dialect/sql/query.tmpl

Co-Authored-By: Ariel Mashraki <7413593+a8m@users.noreply.github.com>

* generate new assets

Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>
This commit is contained in:
Harold.Luo
2020-01-20 22:29:01 +08:00
committed by Ariel Mashraki
parent 89fade53f6
commit 5cb40ff883
49 changed files with 194 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entc/integration/config/ent/user_query.go
View File

@@ -262,6 +262,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if err := sqlgraph.QueryNodes(ctx, uq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/customid/ent/blob_query.go
View File

@@ -287,6 +287,10 @@ func (bq *BlobQuery) sqlAll(ctx context.Context) ([]*Blob, error) {
if err := sqlgraph.QueryNodes(ctx, bq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/customid/ent/group_query.go
View File

@@ -290,6 +290,10 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := gq.withUsers; query != nil {
fks := make([]driver.Value, 0, len(nodes))
ids := make(map[int]*Group, len(nodes))

4
entc/integration/customid/ent/user_query.go
View File

@@ -349,6 +349,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withGroups; query != nil {
fks := make([]driver.Value, 0, len(nodes))
ids := make(map[int]*User, len(nodes))

4
entc/integration/ent/card_query.go
View File

@@ -351,6 +351,10 @@ func (cq *CardQuery) sqlAll(ctx context.Context) ([]*Card, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := cq.withOwner; query != nil {
ids := make([]string, 0, len(nodes))
nodeids := make(map[string][]*Card)

4
entc/integration/ent/comment_query.go
View File

@@ -286,6 +286,10 @@ func (cq *CommentQuery) sqlAll(ctx context.Context) ([]*Comment, error) {
if err := sqlgraph.QueryNodes(ctx, cq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/ent/fieldtype_query.go
View File

@@ -286,6 +286,10 @@ func (ftq *FieldTypeQuery) sqlAll(ctx context.Context) ([]*FieldType, error) {
if err := sqlgraph.QueryNodes(ctx, ftq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/ent/file_query.go
View File

@@ -349,6 +349,10 @@ func (fq *FileQuery) sqlAll(ctx context.Context) ([]*File, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := fq.withOwner; query != nil {
ids := make([]string, 0, len(nodes))
nodeids := make(map[string][]*File)

4
entc/integration/ent/filetype_query.go
View File

@@ -315,6 +315,10 @@ func (ftq *FileTypeQuery) sqlAll(ctx context.Context) ([]*FileType, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := ftq.withFiles; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[string]*FileType)

4
entc/integration/ent/group_query.go
View File

@@ -400,6 +400,10 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := gq.withFiles; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[string]*Group)

4
entc/integration/ent/groupinfo_query.go
View File

@@ -315,6 +315,10 @@ func (giq *GroupInfoQuery) sqlAll(ctx context.Context) ([]*GroupInfo, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := giq.withGroups; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[string]*GroupInfo)

4
entc/integration/ent/item_query.go
View File

@@ -262,6 +262,10 @@ func (iq *ItemQuery) sqlAll(ctx context.Context) ([]*Item, error) {
if err := sqlgraph.QueryNodes(ctx, iq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/ent/node_query.go
View File

@@ -349,6 +349,10 @@ func (nq *NodeQuery) sqlAll(ctx context.Context) ([]*Node, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := nq.withPrev; query != nil {
ids := make([]string, 0, len(nodes))
nodeids := make(map[string][]*Node)

4
entc/integration/ent/pet_query.go
View File

@@ -348,6 +348,10 @@ func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := pq.withTeam; query != nil {
ids := make([]string, 0, len(nodes))
nodeids := make(map[string][]*Pet)

4
entc/integration/ent/spec_query.go
View File

@@ -291,6 +291,10 @@ func (sq *SpecQuery) sqlAll(ctx context.Context) ([]*Spec, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := sq.withCard; query != nil {
fks := make([]driver.Value, 0, len(nodes))
ids := make(map[string]*Spec, len(nodes))

4
entc/integration/ent/user_query.go
View File

@@ -569,6 +569,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withCard; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[string]*User)

4
entc/integration/idtype/ent/user_query.go
View File

@@ -372,6 +372,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withSpouse; query != nil {
ids := make([]uint64, 0, len(nodes))
nodeids := make(map[uint64][]*User)

4
entc/integration/json/ent/user_query.go
View File

@@ -286,6 +286,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
if err := sqlgraph.QueryNodes(ctx, uq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/migrate/entv1/car_query.go
View File

@@ -300,6 +300,10 @@ func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := cq.withOwner; query != nil {
ids := make([]int, 0, len(nodes))
nodeids := make(map[int][]*Car)

4
entc/integration/migrate/entv1/user_query.go
View File

@@ -397,6 +397,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withParent; query != nil {
ids := make([]int, 0, len(nodes))
nodeids := make(map[int][]*User)

4
entc/integration/migrate/entv2/car_query.go
View File

@@ -300,6 +300,10 @@ func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := cq.withOwner; query != nil {
ids := make([]int, 0, len(nodes))
nodeids := make(map[int][]*Car)

4
entc/integration/migrate/entv2/group_query.go
View File

@@ -262,6 +262,10 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if err := sqlgraph.QueryNodes(ctx, gq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/migrate/entv2/pet_query.go
View File

@@ -262,6 +262,10 @@ func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) {
if err := sqlgraph.QueryNodes(ctx, pq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/migrate/entv2/user_query.go
View File

@@ -314,6 +314,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withCar; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[int]*User)

4
entc/integration/template/ent/group_query.go
View File

@@ -286,6 +286,10 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
if err := sqlgraph.QueryNodes(ctx, gq.driver, _spec); err != nil {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
return nodes, nil
}

4
entc/integration/template/ent/pet_query.go
View File

@@ -324,6 +324,10 @@ func (pq *PetQuery) sqlAll(ctx context.Context) ([]*Pet, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := pq.withOwner; query != nil {
ids := make([]int, 0, len(nodes))
nodeids := make(map[int][]*Pet)

4
entc/integration/template/ent/user_query.go
View File

@@ -338,6 +338,10 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
return nil, err
}
if len(nodes) == 0 {
return nodes, nil
}
if query := uq.withPets; query != nil {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[int]*User)