From 065cb9f9ff5f121799d509f0fbcb1cde5865aebe Mon Sep 17 00:00:00 2001 From: Ariel Mashraki <7413593+a8m@users.noreply.github.com> Date: Mon, 10 Apr 2023 06:29:17 +0300 Subject: [PATCH] entc/gen: avoid ambiguous column names when joining the same table (#3461) --- entc/gen/template/dialect/sql/query.tmpl | 2 +- entc/integration/cascadelete/ent/post_query.go | 2 +- entc/integration/cascadelete/ent/user_query.go | 2 +- entc/integration/customid/ent/account_query.go | 2 +- entc/integration/customid/ent/blob_query.go | 2 +- entc/integration/customid/ent/device_query.go | 2 +- entc/integration/customid/ent/doc_query.go | 2 +- entc/integration/customid/ent/intsid_query.go | 2 +- entc/integration/customid/ent/note_query.go | 2 +- entc/integration/customid/ent/pet_query.go | 2 +- entc/integration/customid/ent/user_query.go | 4 ++-- entc/integration/edgefield/ent/car_query.go | 2 +- entc/integration/edgefield/ent/metadata_query.go | 2 +- entc/integration/edgefield/ent/node_query.go | 2 +- entc/integration/edgefield/ent/user_query.go | 12 ++++++------ entc/integration/edgeschema/ent/group_query.go | 4 ++-- entc/integration/edgeschema/ent/process_query.go | 2 +- entc/integration/edgeschema/ent/role_query.go | 2 +- entc/integration/edgeschema/ent/tag_query.go | 4 ++-- entc/integration/edgeschema/ent/tweet_query.go | 6 +++--- entc/integration/edgeschema/ent/user_query.go | 12 ++++++------ entc/integration/ent/file_query.go | 2 +- entc/integration/ent/filetype_query.go | 2 +- entc/integration/ent/group_query.go | 4 ++-- entc/integration/ent/groupinfo_query.go | 2 +- entc/integration/ent/node_query.go | 2 +- entc/integration/ent/user_query.go | 10 +++++----- entc/integration/hooks/ent/user_query.go | 4 ++-- entc/integration/migrate/entv1/user_query.go | 4 ++-- entc/integration/migrate/entv2/blog_query.go | 2 +- entc/integration/migrate/entv2/user_query.go | 4 ++-- entc/integration/multischema/ent/user_query.go | 4 ++-- entc/integration/privacy/ent/user_query.go | 2 +- entc/integration/template/ent/user_query.go | 2 +- examples/edgeindex/ent/city_query.go | 2 +- examples/fs/ent/file_query.go | 2 +- examples/jsonencode/ent/user_query.go | 2 +- examples/migration/ent/user_query.go | 2 +- examples/o2m2types/ent/user_query.go | 2 +- examples/o2mrecur/ent/node_query.go | 2 +- examples/o2o2types/ent/user_query.go | 2 +- examples/o2orecur/ent/node_query.go | 2 +- examples/start/ent/user_query.go | 2 +- examples/traversal/ent/user_query.go | 4 ++-- 44 files changed, 69 insertions(+), 69 deletions(-) diff --git a/entc/gen/template/dialect/sql/query.tmpl b/entc/gen/template/dialect/sql/query.tmpl index 2e6ac3df0..a0ec8044b 100644 --- a/entc/gen/template/dialect/sql/query.tmpl +++ b/entc/gen/template/dialect/sql/query.tmpl @@ -216,7 +216,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlAll(ctx context.Context, hooks ...quer query.withFKs = true {{- end }} query.Where(predicate.{{ $e.Type.Name }}(func(s *sql.Selector) { - s.Where(sql.InValues({{ $.Package }}.{{ $e.ColumnConstant }}, fks...)) + s.Where(sql.InValues(s.C({{ $.Package }}.{{ $e.ColumnConstant }}), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/cascadelete/ent/post_query.go b/entc/integration/cascadelete/ent/post_query.go index 7ede363ff..3276e6265 100644 --- a/entc/integration/cascadelete/ent/post_query.go +++ b/entc/integration/cascadelete/ent/post_query.go @@ -489,7 +489,7 @@ func (pq *PostQuery) loadComments(ctx context.Context, query *CommentQuery, node } } query.Where(predicate.Comment(func(s *sql.Selector) { - s.Where(sql.InValues(post.CommentsColumn, fks...)) + s.Where(sql.InValues(s.C(post.CommentsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/cascadelete/ent/user_query.go b/entc/integration/cascadelete/ent/user_query.go index 49ae64462..ff9bb9a72 100644 --- a/entc/integration/cascadelete/ent/user_query.go +++ b/entc/integration/cascadelete/ent/user_query.go @@ -417,7 +417,7 @@ func (uq *UserQuery) loadPosts(ctx context.Context, query *PostQuery, nodes []*U } } query.Where(predicate.Post(func(s *sql.Selector) { - s.Where(sql.InValues(user.PostsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PostsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/account_query.go b/entc/integration/customid/ent/account_query.go index 5f468b5f7..bae42cca7 100644 --- a/entc/integration/customid/ent/account_query.go +++ b/entc/integration/customid/ent/account_query.go @@ -419,7 +419,7 @@ func (aq *AccountQuery) loadToken(ctx context.Context, query *TokenQuery, nodes } query.withFKs = true query.Where(predicate.Token(func(s *sql.Selector) { - s.Where(sql.InValues(account.TokenColumn, fks...)) + s.Where(sql.InValues(s.C(account.TokenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index ea5326b39..c8e58f0e8 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -604,7 +604,7 @@ func (bq *BlobQuery) loadBlobLinks(ctx context.Context, query *BlobLinkQuery, no } } query.Where(predicate.BlobLink(func(s *sql.Selector) { - s.Where(sql.InValues(blob.BlobLinksColumn, fks...)) + s.Where(sql.InValues(s.C(blob.BlobLinksColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/device_query.go b/entc/integration/customid/ent/device_query.go index 00268675e..a0d9258bc 100644 --- a/entc/integration/customid/ent/device_query.go +++ b/entc/integration/customid/ent/device_query.go @@ -479,7 +479,7 @@ func (dq *DeviceQuery) loadSessions(ctx context.Context, query *SessionQuery, no } query.withFKs = true query.Where(predicate.Session(func(s *sql.Selector) { - s.Where(sql.InValues(device.SessionsColumn, fks...)) + s.Where(sql.InValues(s.C(device.SessionsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/doc_query.go b/entc/integration/customid/ent/doc_query.go index e6f0f8a5b..f9154128d 100644 --- a/entc/integration/customid/ent/doc_query.go +++ b/entc/integration/customid/ent/doc_query.go @@ -543,7 +543,7 @@ func (dq *DocQuery) loadChildren(ctx context.Context, query *DocQuery, nodes []* } query.withFKs = true query.Where(predicate.Doc(func(s *sql.Selector) { - s.Where(sql.InValues(doc.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(doc.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/intsid_query.go b/entc/integration/customid/ent/intsid_query.go index 8a11a2cf0..c67f64b9f 100644 --- a/entc/integration/customid/ent/intsid_query.go +++ b/entc/integration/customid/ent/intsid_query.go @@ -478,7 +478,7 @@ func (isq *IntSIDQuery) loadChildren(ctx context.Context, query *IntSIDQuery, no } query.withFKs = true query.Where(predicate.IntSID(func(s *sql.Selector) { - s.Where(sql.InValues(intsid.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(intsid.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/note_query.go b/entc/integration/customid/ent/note_query.go index 4363c9e34..8bfd6d853 100644 --- a/entc/integration/customid/ent/note_query.go +++ b/entc/integration/customid/ent/note_query.go @@ -500,7 +500,7 @@ func (nq *NoteQuery) loadChildren(ctx context.Context, query *NoteQuery, nodes [ } query.withFKs = true query.Where(predicate.Note(func(s *sql.Selector) { - s.Where(sql.InValues(note.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(note.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index 74f7cfd04..7dedde0dd 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -564,7 +564,7 @@ func (pq *PetQuery) loadCars(ctx context.Context, query *CarQuery, nodes []*Pet, } query.withFKs = true query.Where(predicate.Car(func(s *sql.Selector) { - s.Where(sql.InValues(pet.CarsColumn, fks...)) + s.Where(sql.InValues(s.C(pet.CarsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index d7c2ae6b6..3970b0c6c 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -626,7 +626,7 @@ func (uq *UserQuery) loadChildren(ctx context.Context, query *UserQuery, nodes [ } query.withFKs = true query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(user.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(user.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -657,7 +657,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgefield/ent/car_query.go b/entc/integration/edgefield/ent/car_query.go index 3b385802b..94681d160 100644 --- a/entc/integration/edgefield/ent/car_query.go +++ b/entc/integration/edgefield/ent/car_query.go @@ -418,7 +418,7 @@ func (cq *CarQuery) loadRentals(ctx context.Context, query *RentalQuery, nodes [ } } query.Where(predicate.Rental(func(s *sql.Selector) { - s.Where(sql.InValues(car.RentalsColumn, fks...)) + s.Where(sql.InValues(s.C(car.RentalsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgefield/ent/metadata_query.go b/entc/integration/edgefield/ent/metadata_query.go index c2e9760ca..fd87f8277 100644 --- a/entc/integration/edgefield/ent/metadata_query.go +++ b/entc/integration/edgefield/ent/metadata_query.go @@ -530,7 +530,7 @@ func (mq *MetadataQuery) loadChildren(ctx context.Context, query *MetadataQuery, } } query.Where(predicate.Metadata(func(s *sql.Selector) { - s.Where(sql.InValues(metadata.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(metadata.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgefield/ent/node_query.go b/entc/integration/edgefield/ent/node_query.go index ecc623d4d..f4205f009 100644 --- a/entc/integration/edgefield/ent/node_query.go +++ b/entc/integration/edgefield/ent/node_query.go @@ -483,7 +483,7 @@ func (nq *NodeQuery) loadNext(ctx context.Context, query *NodeQuery, nodes []*No nodeids[nodes[i].ID] = nodes[i] } query.Where(predicate.Node(func(s *sql.Selector) { - s.Where(sql.InValues(node.NextColumn, fks...)) + s.Where(sql.InValues(s.C(node.NextColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgefield/ent/user_query.go b/entc/integration/edgefield/ent/user_query.go index d5fe3c7c6..7d039b7bd 100644 --- a/entc/integration/edgefield/ent/user_query.go +++ b/entc/integration/edgefield/ent/user_query.go @@ -718,7 +718,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } } query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -774,7 +774,7 @@ func (uq *UserQuery) loadChildren(ctx context.Context, query *UserQuery, nodes [ } } query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(user.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(user.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -827,7 +827,7 @@ func (uq *UserQuery) loadCard(ctx context.Context, query *CardQuery, nodes []*Us nodeids[nodes[i].ID] = nodes[i] } query.Where(predicate.Card(func(s *sql.Selector) { - s.Where(sql.InValues(user.CardColumn, fks...)) + s.Where(sql.InValues(s.C(user.CardColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -851,7 +851,7 @@ func (uq *UserQuery) loadMetadata(ctx context.Context, query *MetadataQuery, nod nodeids[nodes[i].ID] = nodes[i] } query.Where(predicate.Metadata(func(s *sql.Selector) { - s.Where(sql.InValues(user.MetadataColumn, fks...)) + s.Where(sql.InValues(s.C(user.MetadataColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -878,7 +878,7 @@ func (uq *UserQuery) loadInfo(ctx context.Context, query *InfoQuery, nodes []*Us } } query.Where(predicate.Info(func(s *sql.Selector) { - s.Where(sql.InValues(user.InfoColumn, fks...)) + s.Where(sql.InValues(s.C(user.InfoColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -905,7 +905,7 @@ func (uq *UserQuery) loadRentals(ctx context.Context, query *RentalQuery, nodes } } query.Where(predicate.Rental(func(s *sql.Selector) { - s.Where(sql.InValues(user.RentalsColumn, fks...)) + s.Where(sql.InValues(s.C(user.RentalsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/group_query.go b/entc/integration/edgeschema/ent/group_query.go index c5fd9e76d..9238300b9 100644 --- a/entc/integration/edgeschema/ent/group_query.go +++ b/entc/integration/edgeschema/ent/group_query.go @@ -671,7 +671,7 @@ func (gq *GroupQuery) loadJoinedUsers(ctx context.Context, query *UserGroupQuery } } query.Where(predicate.UserGroup(func(s *sql.Selector) { - s.Where(sql.InValues(group.JoinedUsersColumn, fks...)) + s.Where(sql.InValues(s.C(group.JoinedUsersColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -698,7 +698,7 @@ func (gq *GroupQuery) loadGroupTags(ctx context.Context, query *GroupTagQuery, n } } query.Where(predicate.GroupTag(func(s *sql.Selector) { - s.Where(sql.InValues(group.GroupTagsColumn, fks...)) + s.Where(sql.InValues(s.C(group.GroupTagsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/process_query.go b/entc/integration/edgeschema/ent/process_query.go index 17a2eab15..b9164e13a 100644 --- a/entc/integration/edgeschema/ent/process_query.go +++ b/entc/integration/edgeschema/ent/process_query.go @@ -500,7 +500,7 @@ func (pq *ProcessQuery) loadAttachedFiles(ctx context.Context, query *AttachedFi } } query.Where(predicate.AttachedFile(func(s *sql.Selector) { - s.Where(sql.InValues(process.AttachedFilesColumn, fks...)) + s.Where(sql.InValues(s.C(process.AttachedFilesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/role_query.go b/entc/integration/edgeschema/ent/role_query.go index 142b27c44..645193f9b 100644 --- a/entc/integration/edgeschema/ent/role_query.go +++ b/entc/integration/edgeschema/ent/role_query.go @@ -522,7 +522,7 @@ func (rq *RoleQuery) loadRolesUsers(ctx context.Context, query *RoleUserQuery, n } } query.Where(predicate.RoleUser(func(s *sql.Selector) { - s.Where(sql.InValues(role.RolesUsersColumn, fks...)) + s.Where(sql.InValues(s.C(role.RolesUsersColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/tag_query.go b/entc/integration/edgeschema/ent/tag_query.go index 4484a0229..097794f84 100644 --- a/entc/integration/edgeschema/ent/tag_query.go +++ b/entc/integration/edgeschema/ent/tag_query.go @@ -671,7 +671,7 @@ func (tq *TagQuery) loadTweetTags(ctx context.Context, query *TweetTagQuery, nod } } query.Where(predicate.TweetTag(func(s *sql.Selector) { - s.Where(sql.InValues(tag.TweetTagsColumn, fks...)) + s.Where(sql.InValues(s.C(tag.TweetTagsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -698,7 +698,7 @@ func (tq *TagQuery) loadGroupTags(ctx context.Context, query *GroupTagQuery, nod } } query.Where(predicate.GroupTag(func(s *sql.Selector) { - s.Where(sql.InValues(tag.GroupTagsColumn, fks...)) + s.Where(sql.InValues(s.C(tag.GroupTagsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/tweet_query.go b/entc/integration/edgeschema/ent/tweet_query.go index 82b66a10a..a76b68e2a 100644 --- a/entc/integration/edgeschema/ent/tweet_query.go +++ b/entc/integration/edgeschema/ent/tweet_query.go @@ -819,7 +819,7 @@ func (tq *TweetQuery) loadLikes(ctx context.Context, query *TweetLikeQuery, node } } query.Where(predicate.TweetLike(func(s *sql.Selector) { - s.Where(sql.InValues(tweet.LikesColumn, fks...)) + s.Where(sql.InValues(s.C(tweet.LikesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -846,7 +846,7 @@ func (tq *TweetQuery) loadTweetUser(ctx context.Context, query *UserTweetQuery, } } query.Where(predicate.UserTweet(func(s *sql.Selector) { - s.Where(sql.InValues(tweet.TweetUserColumn, fks...)) + s.Where(sql.InValues(s.C(tweet.TweetUserColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -873,7 +873,7 @@ func (tq *TweetQuery) loadTweetTags(ctx context.Context, query *TweetTagQuery, n } } query.Where(predicate.TweetTag(func(s *sql.Selector) { - s.Where(sql.InValues(tweet.TweetTagsColumn, fks...)) + s.Where(sql.InValues(s.C(tweet.TweetTagsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/edgeschema/ent/user_query.go b/entc/integration/edgeschema/ent/user_query.go index cdd837e88..6e7e75f42 100644 --- a/entc/integration/edgeschema/ent/user_query.go +++ b/entc/integration/edgeschema/ent/user_query.go @@ -1271,7 +1271,7 @@ func (uq *UserQuery) loadJoinedGroups(ctx context.Context, query *UserGroupQuery } } query.Where(predicate.UserGroup(func(s *sql.Selector) { - s.Where(sql.InValues(user.JoinedGroupsColumn, fks...)) + s.Where(sql.InValues(s.C(user.JoinedGroupsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1298,7 +1298,7 @@ func (uq *UserQuery) loadFriendships(ctx context.Context, query *FriendshipQuery } } query.Where(predicate.Friendship(func(s *sql.Selector) { - s.Where(sql.InValues(user.FriendshipsColumn, fks...)) + s.Where(sql.InValues(s.C(user.FriendshipsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1325,7 +1325,7 @@ func (uq *UserQuery) loadRelationship(ctx context.Context, query *RelationshipQu } } query.Where(predicate.Relationship(func(s *sql.Selector) { - s.Where(sql.InValues(user.RelationshipColumn, fks...)) + s.Where(sql.InValues(s.C(user.RelationshipColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1352,7 +1352,7 @@ func (uq *UserQuery) loadLikes(ctx context.Context, query *TweetLikeQuery, nodes } } query.Where(predicate.TweetLike(func(s *sql.Selector) { - s.Where(sql.InValues(user.LikesColumn, fks...)) + s.Where(sql.InValues(s.C(user.LikesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1379,7 +1379,7 @@ func (uq *UserQuery) loadUserTweets(ctx context.Context, query *UserTweetQuery, } } query.Where(predicate.UserTweet(func(s *sql.Selector) { - s.Where(sql.InValues(user.UserTweetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.UserTweetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1406,7 +1406,7 @@ func (uq *UserQuery) loadRolesUsers(ctx context.Context, query *RoleUserQuery, n } } query.Where(predicate.RoleUser(func(s *sql.Selector) { - s.Where(sql.InValues(user.RolesUsersColumn, fks...)) + s.Where(sql.InValues(s.C(user.RolesUsersColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index b1194dc95..07fd54267 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -589,7 +589,7 @@ func (fq *FileQuery) loadField(ctx context.Context, query *FieldTypeQuery, nodes } query.withFKs = true query.Where(predicate.FieldType(func(s *sql.Selector) { - s.Where(sql.InValues(file.FieldColumn, fks...)) + s.Where(sql.InValues(s.C(file.FieldColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index f203837aa..b00886dbf 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -431,7 +431,7 @@ func (ftq *FileTypeQuery) loadFiles(ctx context.Context, query *FileQuery, nodes } query.withFKs = true query.Where(predicate.File(func(s *sql.Selector) { - s.Where(sql.InValues(filetype.FilesColumn, fks...)) + s.Where(sql.InValues(s.C(filetype.FilesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 446a6377d..e1a5b6c31 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -585,7 +585,7 @@ func (gq *GroupQuery) loadFiles(ctx context.Context, query *FileQuery, nodes []* } query.withFKs = true query.Where(predicate.File(func(s *sql.Selector) { - s.Where(sql.InValues(group.FilesColumn, fks...)) + s.Where(sql.InValues(s.C(group.FilesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -616,7 +616,7 @@ func (gq *GroupQuery) loadBlocked(ctx context.Context, query *UserQuery, nodes [ } query.withFKs = true query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(group.BlockedColumn, fks...)) + s.Where(sql.InValues(s.C(group.BlockedColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 21c02e808..a7d4aee1e 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -431,7 +431,7 @@ func (giq *GroupInfoQuery) loadGroups(ctx context.Context, query *GroupQuery, no } query.withFKs = true query.Where(predicate.Group(func(s *sql.Selector) { - s.Where(sql.InValues(groupinfo.GroupsColumn, fks...)) + s.Where(sql.InValues(s.C(groupinfo.GroupsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index 505cdbec6..b3b073988 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -500,7 +500,7 @@ func (nq *NodeQuery) loadNext(ctx context.Context, query *NodeQuery, nodes []*No } query.withFKs = true query.Where(predicate.Node(func(s *sql.Selector) { - s.Where(sql.InValues(node.NextColumn, fks...)) + s.Where(sql.InValues(s.C(node.NextColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 234ff53d2..5d1cf9d2b 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -913,7 +913,7 @@ func (uq *UserQuery) loadCard(ctx context.Context, query *CardQuery, nodes []*Us } query.withFKs = true query.Where(predicate.Card(func(s *sql.Selector) { - s.Where(sql.InValues(user.CardColumn, fks...)) + s.Where(sql.InValues(s.C(user.CardColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -944,7 +944,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -975,7 +975,7 @@ func (uq *UserQuery) loadFiles(ctx context.Context, query *FileQuery, nodes []*U } query.withFKs = true query.Where(predicate.File(func(s *sql.Selector) { - s.Where(sql.InValues(user.FilesColumn, fks...)) + s.Where(sql.InValues(s.C(user.FilesColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1247,7 +1247,7 @@ func (uq *UserQuery) loadTeam(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.TeamColumn, fks...)) + s.Where(sql.InValues(s.C(user.TeamColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -1310,7 +1310,7 @@ func (uq *UserQuery) loadChildren(ctx context.Context, query *UserQuery, nodes [ } query.withFKs = true query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(user.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(user.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index 31692248d..bd9ccdc31 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -555,7 +555,7 @@ func (uq *UserQuery) loadCards(ctx context.Context, query *CardQuery, nodes []*U } query.withFKs = true query.Where(predicate.Card(func(s *sql.Selector) { - s.Where(sql.InValues(user.CardsColumn, fks...)) + s.Where(sql.InValues(s.C(user.CardsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -586,7 +586,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index 0e76bf091..b0729021b 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -584,7 +584,7 @@ func (uq *UserQuery) loadChildren(ctx context.Context, query *UserQuery, nodes [ } query.withFKs = true query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(user.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(user.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -644,7 +644,7 @@ func (uq *UserQuery) loadCar(ctx context.Context, query *CarQuery, nodes []*User } query.withFKs = true query.Where(predicate.Car(func(s *sql.Selector) { - s.Where(sql.InValues(user.CarColumn, fks...)) + s.Where(sql.InValues(s.C(user.CarColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/migrate/entv2/blog_query.go b/entc/integration/migrate/entv2/blog_query.go index 713438e92..73646cbaa 100644 --- a/entc/integration/migrate/entv2/blog_query.go +++ b/entc/integration/migrate/entv2/blog_query.go @@ -418,7 +418,7 @@ func (bq *BlogQuery) loadAdmins(ctx context.Context, query *UserQuery, nodes []* } query.withFKs = true query.Where(predicate.User(func(s *sql.Selector) { - s.Where(sql.InValues(blog.AdminsColumn, fks...)) + s.Where(sql.InValues(s.C(blog.AdminsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index dc8428304..074376e8b 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -509,7 +509,7 @@ func (uq *UserQuery) loadCar(ctx context.Context, query *CarQuery, nodes []*User } query.withFKs = true query.Where(predicate.Car(func(s *sql.Selector) { - s.Where(sql.InValues(user.CarColumn, fks...)) + s.Where(sql.InValues(s.C(user.CarColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -537,7 +537,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/multischema/ent/user_query.go b/entc/integration/multischema/ent/user_query.go index 34bd2a94b..8de519026 100644 --- a/entc/integration/multischema/ent/user_query.go +++ b/entc/integration/multischema/ent/user_query.go @@ -567,7 +567,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } } query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -718,7 +718,7 @@ func (uq *UserQuery) loadFriendships(ctx context.Context, query *FriendshipQuery } } query.Where(predicate.Friendship(func(s *sql.Selector) { - s.Where(sql.InValues(user.FriendshipsColumn, fks...)) + s.Where(sql.InValues(s.C(user.FriendshipsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/privacy/ent/user_query.go b/entc/integration/privacy/ent/user_query.go index bae8a71c8..337c22460 100644 --- a/entc/integration/privacy/ent/user_query.go +++ b/entc/integration/privacy/ent/user_query.go @@ -530,7 +530,7 @@ func (uq *UserQuery) loadTasks(ctx context.Context, query *TaskQuery, nodes []*U } query.withFKs = true query.Where(predicate.Task(func(s *sql.Selector) { - s.Where(sql.InValues(user.TasksColumn, fks...)) + s.Where(sql.InValues(s.C(user.TasksColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index 76a9c3ab8..93af7022d 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -467,7 +467,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index b013e08cf..0ea537a44 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -418,7 +418,7 @@ func (cq *CityQuery) loadStreets(ctx context.Context, query *StreetQuery, nodes } query.withFKs = true query.Where(predicate.Street(func(s *sql.Selector) { - s.Where(sql.InValues(city.StreetsColumn, fks...)) + s.Where(sql.InValues(s.C(city.StreetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/fs/ent/file_query.go b/examples/fs/ent/file_query.go index c21e0f883..08f693256 100644 --- a/examples/fs/ent/file_query.go +++ b/examples/fs/ent/file_query.go @@ -487,7 +487,7 @@ func (fq *FileQuery) loadChildren(ctx context.Context, query *FileQuery, nodes [ } } query.Where(predicate.File(func(s *sql.Selector) { - s.Where(sql.InValues(file.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(file.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/jsonencode/ent/user_query.go b/examples/jsonencode/ent/user_query.go index 5b7dfcc74..beb9e55ff 100644 --- a/examples/jsonencode/ent/user_query.go +++ b/examples/jsonencode/ent/user_query.go @@ -417,7 +417,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } } query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/migration/ent/user_query.go b/examples/migration/ent/user_query.go index 5949ddc76..ab1a50701 100644 --- a/examples/migration/ent/user_query.go +++ b/examples/migration/ent/user_query.go @@ -417,7 +417,7 @@ func (uq *UserQuery) loadCards(ctx context.Context, query *CardQuery, nodes []*U } } query.Where(predicate.Card(func(s *sql.Selector) { - s.Where(sql.InValues(user.CardsColumn, fks...)) + s.Where(sql.InValues(s.C(user.CardsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 93dea5b00..b24001fb9 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -418,7 +418,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index 92ec2dbba..243190422 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -487,7 +487,7 @@ func (nq *NodeQuery) loadChildren(ctx context.Context, query *NodeQuery, nodes [ } } query.Where(predicate.Node(func(s *sql.Selector) { - s.Where(sql.InValues(node.ChildrenColumn, fks...)) + s.Where(sql.InValues(s.C(node.ChildrenColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index 9ae0b8fcf..50f7da728 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -414,7 +414,7 @@ func (uq *UserQuery) loadCard(ctx context.Context, query *CardQuery, nodes []*Us } query.withFKs = true query.Where(predicate.Card(func(s *sql.Selector) { - s.Where(sql.InValues(user.CardColumn, fks...)) + s.Where(sql.InValues(s.C(user.CardColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index ebefff8f3..13b335c4c 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -483,7 +483,7 @@ func (nq *NodeQuery) loadNext(ctx context.Context, query *NodeQuery, nodes []*No nodeids[nodes[i].ID] = nodes[i] } query.Where(predicate.Node(func(s *sql.Selector) { - s.Where(sql.InValues(node.NextColumn, fks...)) + s.Where(sql.InValues(s.C(node.NextColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index 562df4e0c..232eb1567 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -462,7 +462,7 @@ func (uq *UserQuery) loadCars(ctx context.Context, query *CarQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Car(func(s *sql.Selector) { - s.Where(sql.InValues(user.CarsColumn, fks...)) + s.Where(sql.InValues(s.C(user.CarsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 01a82543c..a27a1d9c4 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -548,7 +548,7 @@ func (uq *UserQuery) loadPets(ctx context.Context, query *PetQuery, nodes []*Use } query.withFKs = true query.Where(predicate.Pet(func(s *sql.Selector) { - s.Where(sql.InValues(user.PetsColumn, fks...)) + s.Where(sql.InValues(s.C(user.PetsColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil { @@ -701,7 +701,7 @@ func (uq *UserQuery) loadManage(ctx context.Context, query *GroupQuery, nodes [] } query.withFKs = true query.Where(predicate.Group(func(s *sql.Selector) { - s.Where(sql.InValues(user.ManageColumn, fks...)) + s.Where(sql.InValues(s.C(user.ManageColumn), fks...)) })) neighbors, err := query.All(ctx) if err != nil {