From a75e9c5a8f51ebf6ddae39f857dc1313c606b976 Mon Sep 17 00:00:00 2001 From: MrParano1d Date: Tue, 15 Feb 2022 21:31:05 +0100 Subject: [PATCH] entc/gen: fix missing unique field in query builder template (#2332) * fix(query): fix missing unique field in query builder template when a query gets cloned the unique field doesn't get cloned #2331 * fix(query): added missing go generate ./... #2331 * fix(query): added missing go generate ./... #2331 --- entc/gen/template/builder/query.tmpl | 1 + entc/integration/cascadelete/ent/comment_query.go | 5 +++-- entc/integration/cascadelete/ent/post_query.go | 5 +++-- entc/integration/cascadelete/ent/user_query.go | 5 +++-- entc/integration/config/ent/user_query.go | 5 +++-- entc/integration/customid/ent/blob_query.go | 5 +++-- entc/integration/customid/ent/car_query.go | 5 +++-- entc/integration/customid/ent/device_query.go | 5 +++-- entc/integration/customid/ent/doc_query.go | 5 +++-- entc/integration/customid/ent/group_query.go | 5 +++-- entc/integration/customid/ent/mixinid_query.go | 5 +++-- entc/integration/customid/ent/note_query.go | 5 +++-- entc/integration/customid/ent/other_query.go | 5 +++-- entc/integration/customid/ent/pet_query.go | 5 +++-- entc/integration/customid/ent/session_query.go | 5 +++-- entc/integration/customid/ent/user_query.go | 5 +++-- entc/integration/edgefield/ent/car_query.go | 5 +++-- entc/integration/edgefield/ent/card_query.go | 5 +++-- entc/integration/edgefield/ent/info_query.go | 5 +++-- entc/integration/edgefield/ent/metadata_query.go | 5 +++-- entc/integration/edgefield/ent/node_query.go | 5 +++-- entc/integration/edgefield/ent/pet_query.go | 5 +++-- entc/integration/edgefield/ent/post_query.go | 5 +++-- entc/integration/edgefield/ent/rental_query.go | 5 +++-- entc/integration/edgefield/ent/user_query.go | 5 +++-- entc/integration/ent/card_query.go | 5 +++-- entc/integration/ent/comment_query.go | 5 +++-- entc/integration/ent/fieldtype_query.go | 5 +++-- entc/integration/ent/file_query.go | 5 +++-- entc/integration/ent/filetype_query.go | 5 +++-- entc/integration/ent/goods_query.go | 5 +++-- entc/integration/ent/group_query.go | 5 +++-- entc/integration/ent/groupinfo_query.go | 5 +++-- entc/integration/ent/item_query.go | 5 +++-- entc/integration/ent/node_query.go | 5 +++-- entc/integration/ent/pet_query.go | 5 +++-- entc/integration/ent/spec_query.go | 5 +++-- entc/integration/ent/task_query.go | 5 +++-- entc/integration/ent/user_query.go | 5 +++-- entc/integration/gremlin/ent/card_query.go | 1 + entc/integration/gremlin/ent/comment_query.go | 1 + entc/integration/gremlin/ent/fieldtype_query.go | 1 + entc/integration/gremlin/ent/file_query.go | 1 + entc/integration/gremlin/ent/filetype_query.go | 1 + entc/integration/gremlin/ent/goods_query.go | 1 + entc/integration/gremlin/ent/group_query.go | 1 + entc/integration/gremlin/ent/groupinfo_query.go | 1 + entc/integration/gremlin/ent/item_query.go | 1 + entc/integration/gremlin/ent/node_query.go | 1 + entc/integration/gremlin/ent/pet_query.go | 1 + entc/integration/gremlin/ent/spec_query.go | 1 + entc/integration/gremlin/ent/task_query.go | 1 + entc/integration/gremlin/ent/user_query.go | 1 + entc/integration/hooks/ent/card_query.go | 5 +++-- entc/integration/hooks/ent/user_query.go | 5 +++-- entc/integration/idtype/ent/user_query.go | 5 +++-- entc/integration/json/ent/user_query.go | 5 +++-- entc/integration/migrate/entv1/car_query.go | 5 +++-- entc/integration/migrate/entv1/conversion_query.go | 5 +++-- entc/integration/migrate/entv1/customtype_query.go | 5 +++-- entc/integration/migrate/entv1/user_query.go | 5 +++-- entc/integration/migrate/entv2/car_query.go | 5 +++-- entc/integration/migrate/entv2/conversion_query.go | 5 +++-- entc/integration/migrate/entv2/customtype_query.go | 5 +++-- entc/integration/migrate/entv2/group_query.go | 5 +++-- entc/integration/migrate/entv2/media_query.go | 5 +++-- entc/integration/migrate/entv2/pet_query.go | 5 +++-- entc/integration/migrate/entv2/user_query.go | 5 +++-- entc/integration/multischema/ent/group_query.go | 5 +++-- entc/integration/multischema/ent/pet_query.go | 5 +++-- entc/integration/multischema/ent/user_query.go | 5 +++-- entc/integration/privacy/ent/task_query.go | 5 +++-- entc/integration/privacy/ent/team_query.go | 5 +++-- entc/integration/privacy/ent/user_query.go | 5 +++-- entc/integration/template/ent/group_query.go | 5 +++-- entc/integration/template/ent/pet_query.go | 5 +++-- entc/integration/template/ent/user_query.go | 5 +++-- examples/edgeindex/ent/city_query.go | 5 +++-- examples/edgeindex/ent/street_query.go | 5 +++-- examples/entcpkg/ent/user_query.go | 5 +++-- examples/fs/ent/file_query.go | 5 +++-- examples/m2m2types/ent/group_query.go | 5 +++-- examples/m2m2types/ent/user_query.go | 5 +++-- examples/m2mbidi/ent/user_query.go | 5 +++-- examples/m2mrecur/ent/user_query.go | 5 +++-- examples/o2m2types/ent/pet_query.go | 5 +++-- examples/o2m2types/ent/user_query.go | 5 +++-- examples/o2mrecur/ent/node_query.go | 5 +++-- examples/o2o2types/ent/card_query.go | 5 +++-- examples/o2o2types/ent/user_query.go | 5 +++-- examples/o2obidi/ent/user_query.go | 5 +++-- examples/o2orecur/ent/node_query.go | 5 +++-- examples/privacyadmin/ent/user_query.go | 5 +++-- examples/privacytenant/ent/group_query.go | 5 +++-- examples/privacytenant/ent/tenant_query.go | 5 +++-- examples/privacytenant/ent/user_query.go | 5 +++-- examples/start/ent/car_query.go | 5 +++-- examples/start/ent/group_query.go | 5 +++-- examples/start/ent/user_query.go | 5 +++-- examples/traversal/ent/group_query.go | 5 +++-- examples/traversal/ent/pet_query.go | 5 +++-- examples/traversal/ent/user_query.go | 5 +++-- examples/version/ent/user_query.go | 5 +++-- 103 files changed, 279 insertions(+), 176 deletions(-) diff --git a/entc/gen/template/builder/query.tmpl b/entc/gen/template/builder/query.tmpl index a57551a86..af2922949 100644 --- a/entc/gen/template/builder/query.tmpl +++ b/entc/gen/template/builder/query.tmpl @@ -285,6 +285,7 @@ func ({{ $receiver }} *{{ $builder }}) Clone() *{{ $builder }} { // clone intermediate query. {{ $.Storage }}: {{ $receiver }}.{{ $.Storage }}.Clone(), path: {{ $receiver }}.path, + unique: {{ $receiver }}.unique, } } diff --git a/entc/integration/cascadelete/ent/comment_query.go b/entc/integration/cascadelete/ent/comment_query.go index a640aaf1c..03079df0c 100644 --- a/entc/integration/cascadelete/ent/comment_query.go +++ b/entc/integration/cascadelete/ent/comment_query.go @@ -272,8 +272,9 @@ func (cq *CommentQuery) Clone() *CommentQuery { predicates: append([]predicate.Comment{}, cq.predicates...), withPost: cq.withPost.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/cascadelete/ent/post_query.go b/entc/integration/cascadelete/ent/post_query.go index 2ecdf52ba..120b01fcf 100644 --- a/entc/integration/cascadelete/ent/post_query.go +++ b/entc/integration/cascadelete/ent/post_query.go @@ -298,8 +298,9 @@ func (pq *PostQuery) Clone() *PostQuery { withAuthor: pq.withAuthor.Clone(), withComments: pq.withComments.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/cascadelete/ent/user_query.go b/entc/integration/cascadelete/ent/user_query.go index 210c5d025..ca94983b5 100644 --- a/entc/integration/cascadelete/ent/user_query.go +++ b/entc/integration/cascadelete/ent/user_query.go @@ -273,8 +273,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withPosts: uq.withPosts.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index b5b8cd99c..7c9890922 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -246,8 +246,9 @@ func (uq *UserQuery) Clone() *UserQuery { order: append([]OrderFunc{}, uq.order...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index ef821250a..a41c029c5 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -298,8 +298,9 @@ func (bq *BlobQuery) Clone() *BlobQuery { withParent: bq.withParent.Clone(), withLinks: bq.withLinks.Clone(), // clone intermediate query. - sql: bq.sql.Clone(), - path: bq.path, + sql: bq.sql.Clone(), + path: bq.path, + unique: bq.unique, } } diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index 39a4f469c..a35bf88fa 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -273,8 +273,9 @@ func (cq *CarQuery) Clone() *CarQuery { predicates: append([]predicate.Car{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/customid/ent/device_query.go b/entc/integration/customid/ent/device_query.go index 6dbea6d9d..fb34a1206 100644 --- a/entc/integration/customid/ent/device_query.go +++ b/entc/integration/customid/ent/device_query.go @@ -299,8 +299,9 @@ func (dq *DeviceQuery) Clone() *DeviceQuery { withActiveSession: dq.withActiveSession.Clone(), withSessions: dq.withSessions.Clone(), // clone intermediate query. - sql: dq.sql.Clone(), - path: dq.path, + sql: dq.sql.Clone(), + path: dq.path, + unique: dq.unique, } } diff --git a/entc/integration/customid/ent/doc_query.go b/entc/integration/customid/ent/doc_query.go index c51448602..e3fd2b82b 100644 --- a/entc/integration/customid/ent/doc_query.go +++ b/entc/integration/customid/ent/doc_query.go @@ -298,8 +298,9 @@ func (dq *DocQuery) Clone() *DocQuery { withParent: dq.withParent.Clone(), withChildren: dq.withChildren.Clone(), // clone intermediate query. - sql: dq.sql.Clone(), - path: dq.path, + sql: dq.sql.Clone(), + path: dq.path, + unique: dq.unique, } } diff --git a/entc/integration/customid/ent/group_query.go b/entc/integration/customid/ent/group_query.go index 8edb0f525..65e82a6d2 100644 --- a/entc/integration/customid/ent/group_query.go +++ b/entc/integration/customid/ent/group_query.go @@ -273,8 +273,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { predicates: append([]predicate.Group{}, gq.predicates...), withUsers: gq.withUsers.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/customid/ent/mixinid_query.go b/entc/integration/customid/ent/mixinid_query.go index 8b3da1792..5c0e69ada 100644 --- a/entc/integration/customid/ent/mixinid_query.go +++ b/entc/integration/customid/ent/mixinid_query.go @@ -247,8 +247,9 @@ func (miq *MixinIDQuery) Clone() *MixinIDQuery { order: append([]OrderFunc{}, miq.order...), predicates: append([]predicate.MixinID{}, miq.predicates...), // clone intermediate query. - sql: miq.sql.Clone(), - path: miq.path, + sql: miq.sql.Clone(), + path: miq.path, + unique: miq.unique, } } diff --git a/entc/integration/customid/ent/note_query.go b/entc/integration/customid/ent/note_query.go index 6d50471c3..4849926e1 100644 --- a/entc/integration/customid/ent/note_query.go +++ b/entc/integration/customid/ent/note_query.go @@ -298,8 +298,9 @@ func (nq *NoteQuery) Clone() *NoteQuery { withParent: nq.withParent.Clone(), withChildren: nq.withChildren.Clone(), // clone intermediate query. - sql: nq.sql.Clone(), - path: nq.path, + sql: nq.sql.Clone(), + path: nq.path, + unique: nq.unique, } } diff --git a/entc/integration/customid/ent/other_query.go b/entc/integration/customid/ent/other_query.go index 662e4d170..e97309e35 100644 --- a/entc/integration/customid/ent/other_query.go +++ b/entc/integration/customid/ent/other_query.go @@ -247,8 +247,9 @@ func (oq *OtherQuery) Clone() *OtherQuery { order: append([]OrderFunc{}, oq.order...), predicates: append([]predicate.Other{}, oq.predicates...), // clone intermediate query. - sql: oq.sql.Clone(), - path: oq.path, + sql: oq.sql.Clone(), + path: oq.path, + unique: oq.unique, } } diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index e4bf274e9..4b4bdd851 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -347,8 +347,9 @@ func (pq *PetQuery) Clone() *PetQuery { withFriends: pq.withFriends.Clone(), withBestFriend: pq.withBestFriend.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/customid/ent/session_query.go b/entc/integration/customid/ent/session_query.go index 6c25d85c2..3ae962943 100644 --- a/entc/integration/customid/ent/session_query.go +++ b/entc/integration/customid/ent/session_query.go @@ -274,8 +274,9 @@ func (sq *SessionQuery) Clone() *SessionQuery { predicates: append([]predicate.Session{}, sq.predicates...), withDevice: sq.withDevice.Clone(), // clone intermediate query. - sql: sq.sql.Clone(), - path: sq.path, + sql: sq.sql.Clone(), + path: sq.path, + unique: sq.unique, } } diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index cfe253c23..8cd1c6207 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -347,8 +347,9 @@ func (uq *UserQuery) Clone() *UserQuery { withChildren: uq.withChildren.Clone(), withPets: uq.withPets.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/edgefield/ent/car_query.go b/entc/integration/edgefield/ent/car_query.go index 9483a02a4..88296fdcf 100644 --- a/entc/integration/edgefield/ent/car_query.go +++ b/entc/integration/edgefield/ent/car_query.go @@ -274,8 +274,9 @@ func (cq *CarQuery) Clone() *CarQuery { predicates: append([]predicate.Car{}, cq.predicates...), withRentals: cq.withRentals.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/edgefield/ent/card_query.go b/entc/integration/edgefield/ent/card_query.go index a3393ee63..3cc645379 100644 --- a/entc/integration/edgefield/ent/card_query.go +++ b/entc/integration/edgefield/ent/card_query.go @@ -272,8 +272,9 @@ func (cq *CardQuery) Clone() *CardQuery { predicates: append([]predicate.Card{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/edgefield/ent/info_query.go b/entc/integration/edgefield/ent/info_query.go index 8f8f028c7..aafa7b113 100644 --- a/entc/integration/edgefield/ent/info_query.go +++ b/entc/integration/edgefield/ent/info_query.go @@ -272,8 +272,9 @@ func (iq *InfoQuery) Clone() *InfoQuery { predicates: append([]predicate.Info{}, iq.predicates...), withUser: iq.withUser.Clone(), // clone intermediate query. - sql: iq.sql.Clone(), - path: iq.path, + sql: iq.sql.Clone(), + path: iq.path, + unique: iq.unique, } } diff --git a/entc/integration/edgefield/ent/metadata_query.go b/entc/integration/edgefield/ent/metadata_query.go index ca7a17b09..b3f449b94 100644 --- a/entc/integration/edgefield/ent/metadata_query.go +++ b/entc/integration/edgefield/ent/metadata_query.go @@ -321,8 +321,9 @@ func (mq *MetadataQuery) Clone() *MetadataQuery { withChildren: mq.withChildren.Clone(), withParent: mq.withParent.Clone(), // clone intermediate query. - sql: mq.sql.Clone(), - path: mq.path, + sql: mq.sql.Clone(), + path: mq.path, + unique: mq.unique, } } diff --git a/entc/integration/edgefield/ent/node_query.go b/entc/integration/edgefield/ent/node_query.go index 5027dd8ab..2b88548ba 100644 --- a/entc/integration/edgefield/ent/node_query.go +++ b/entc/integration/edgefield/ent/node_query.go @@ -296,8 +296,9 @@ func (nq *NodeQuery) Clone() *NodeQuery { withPrev: nq.withPrev.Clone(), withNext: nq.withNext.Clone(), // clone intermediate query. - sql: nq.sql.Clone(), - path: nq.path, + sql: nq.sql.Clone(), + path: nq.path, + unique: nq.unique, } } diff --git a/entc/integration/edgefield/ent/pet_query.go b/entc/integration/edgefield/ent/pet_query.go index a9b3c553a..831fbd0a8 100644 --- a/entc/integration/edgefield/ent/pet_query.go +++ b/entc/integration/edgefield/ent/pet_query.go @@ -272,8 +272,9 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/edgefield/ent/post_query.go b/entc/integration/edgefield/ent/post_query.go index 1bd8d3d28..38c80db0d 100644 --- a/entc/integration/edgefield/ent/post_query.go +++ b/entc/integration/edgefield/ent/post_query.go @@ -272,8 +272,9 @@ func (pq *PostQuery) Clone() *PostQuery { predicates: append([]predicate.Post{}, pq.predicates...), withAuthor: pq.withAuthor.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/edgefield/ent/rental_query.go b/entc/integration/edgefield/ent/rental_query.go index 6f94c20e5..0bd27a8c7 100644 --- a/entc/integration/edgefield/ent/rental_query.go +++ b/entc/integration/edgefield/ent/rental_query.go @@ -298,8 +298,9 @@ func (rq *RentalQuery) Clone() *RentalQuery { withUser: rq.withUser.Clone(), withCar: rq.withCar.Clone(), // clone intermediate query. - sql: rq.sql.Clone(), - path: rq.path, + sql: rq.sql.Clone(), + path: rq.path, + unique: rq.unique, } } diff --git a/entc/integration/edgefield/ent/user_query.go b/entc/integration/edgefield/ent/user_query.go index 5e8e6a1f2..8cb4aab96 100644 --- a/entc/integration/edgefield/ent/user_query.go +++ b/entc/integration/edgefield/ent/user_query.go @@ -445,8 +445,9 @@ func (uq *UserQuery) Clone() *UserQuery { withInfo: uq.withInfo.Clone(), withRentals: uq.withRentals.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 6208a8fc2..d0cef51ed 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -301,8 +301,9 @@ func (cq *CardQuery) Clone() *CardQuery { withOwner: cq.withOwner.Clone(), withSpec: cq.withSpec.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 766321df8..49f48a5ec 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -248,8 +248,9 @@ func (cq *CommentQuery) Clone() *CommentQuery { order: append([]OrderFunc{}, cq.order...), predicates: append([]predicate.Comment{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index ef88644fe..8f73dc652 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -249,8 +249,9 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { order: append([]OrderFunc{}, ftq.order...), predicates: append([]predicate.FieldType{}, ftq.predicates...), // clone intermediate query. - sql: ftq.sql.Clone(), - path: ftq.path, + sql: ftq.sql.Clone(), + path: ftq.path, + unique: ftq.unique, } } diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index f0f490854..966ef1918 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -326,8 +326,9 @@ func (fq *FileQuery) Clone() *FileQuery { withType: fq.withType.Clone(), withField: fq.withField.Clone(), // clone intermediate query. - sql: fq.sql.Clone(), - path: fq.path, + sql: fq.sql.Clone(), + path: fq.path, + unique: fq.unique, } } diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index 2ec8c8c0f..82ad86124 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -275,8 +275,9 @@ func (ftq *FileTypeQuery) Clone() *FileTypeQuery { predicates: append([]predicate.FileType{}, ftq.predicates...), withFiles: ftq.withFiles.Clone(), // clone intermediate query. - sql: ftq.sql.Clone(), - path: ftq.path, + sql: ftq.sql.Clone(), + path: ftq.path, + unique: ftq.unique, } } diff --git a/entc/integration/ent/goods_query.go b/entc/integration/ent/goods_query.go index 66a910866..a23e8c5bf 100644 --- a/entc/integration/ent/goods_query.go +++ b/entc/integration/ent/goods_query.go @@ -248,8 +248,9 @@ func (gq *GoodsQuery) Clone() *GoodsQuery { order: append([]OrderFunc{}, gq.order...), predicates: append([]predicate.Goods{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 1d973b828..ae745beb7 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -350,8 +350,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { withUsers: gq.withUsers.Clone(), withInfo: gq.withInfo.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 6a834afcc..22e5b97b1 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -275,8 +275,9 @@ func (giq *GroupInfoQuery) Clone() *GroupInfoQuery { predicates: append([]predicate.GroupInfo{}, giq.predicates...), withGroups: giq.withGroups.Clone(), // clone intermediate query. - sql: giq.sql.Clone(), - path: giq.path, + sql: giq.sql.Clone(), + path: giq.path, + unique: giq.unique, } } diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 8a99b5757..3a7f97c4d 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -248,8 +248,9 @@ func (iq *ItemQuery) Clone() *ItemQuery { order: append([]OrderFunc{}, iq.order...), predicates: append([]predicate.Item{}, iq.predicates...), // clone intermediate query. - sql: iq.sql.Clone(), - path: iq.path, + sql: iq.sql.Clone(), + path: iq.path, + unique: iq.unique, } } diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index 97e432f99..4259ae939 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -299,8 +299,9 @@ func (nq *NodeQuery) Clone() *NodeQuery { withPrev: nq.withPrev.Clone(), withNext: nq.withNext.Clone(), // clone intermediate query. - sql: nq.sql.Clone(), - path: nq.path, + sql: nq.sql.Clone(), + path: nq.path, + unique: nq.unique, } } diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index b2a34f50b..11a9406e4 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -299,8 +299,9 @@ func (pq *PetQuery) Clone() *PetQuery { withTeam: pq.withTeam.Clone(), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index 054fe2522..eacde981b 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -275,8 +275,9 @@ func (sq *SpecQuery) Clone() *SpecQuery { predicates: append([]predicate.Spec{}, sq.predicates...), withCard: sq.withCard.Clone(), // clone intermediate query. - sql: sq.sql.Clone(), - path: sq.path, + sql: sq.sql.Clone(), + path: sq.path, + unique: sq.unique, } } diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index b646da522..c3d8fae0e 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -249,8 +249,9 @@ func (tq *TaskQuery) Clone() *TaskQuery { order: append([]OrderFunc{}, tq.order...), predicates: append([]predicate.Task{}, tq.predicates...), // clone intermediate query. - sql: tq.sql.Clone(), - path: tq.path, + sql: tq.sql.Clone(), + path: tq.path, + unique: tq.unique, } } diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 8401e0bf5..b2a39730e 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -519,8 +519,9 @@ func (uq *UserQuery) Clone() *UserQuery { withChildren: uq.withChildren.Clone(), withParent: uq.withParent.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/gremlin/ent/card_query.go b/entc/integration/gremlin/ent/card_query.go index 48ddbd0e1..834a5c1c8 100644 --- a/entc/integration/gremlin/ent/card_query.go +++ b/entc/integration/gremlin/ent/card_query.go @@ -284,6 +284,7 @@ func (cq *CardQuery) Clone() *CardQuery { // clone intermediate query. gremlin: cq.gremlin.Clone(), path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/gremlin/ent/comment_query.go b/entc/integration/gremlin/ent/comment_query.go index e75e7470a..3b2f03d15 100644 --- a/entc/integration/gremlin/ent/comment_query.go +++ b/entc/integration/gremlin/ent/comment_query.go @@ -249,6 +249,7 @@ func (cq *CommentQuery) Clone() *CommentQuery { // clone intermediate query. gremlin: cq.gremlin.Clone(), path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/gremlin/ent/fieldtype_query.go b/entc/integration/gremlin/ent/fieldtype_query.go index 11c8fa664..39ab1e739 100644 --- a/entc/integration/gremlin/ent/fieldtype_query.go +++ b/entc/integration/gremlin/ent/fieldtype_query.go @@ -249,6 +249,7 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { // clone intermediate query. gremlin: ftq.gremlin.Clone(), path: ftq.path, + unique: ftq.unique, } } diff --git a/entc/integration/gremlin/ent/file_query.go b/entc/integration/gremlin/ent/file_query.go index 3af2c30e6..8c35e695c 100644 --- a/entc/integration/gremlin/ent/file_query.go +++ b/entc/integration/gremlin/ent/file_query.go @@ -300,6 +300,7 @@ func (fq *FileQuery) Clone() *FileQuery { // clone intermediate query. gremlin: fq.gremlin.Clone(), path: fq.path, + unique: fq.unique, } } diff --git a/entc/integration/gremlin/ent/filetype_query.go b/entc/integration/gremlin/ent/filetype_query.go index 6499f7aed..52714645f 100644 --- a/entc/integration/gremlin/ent/filetype_query.go +++ b/entc/integration/gremlin/ent/filetype_query.go @@ -266,6 +266,7 @@ func (ftq *FileTypeQuery) Clone() *FileTypeQuery { // clone intermediate query. gremlin: ftq.gremlin.Clone(), path: ftq.path, + unique: ftq.unique, } } diff --git a/entc/integration/gremlin/ent/goods_query.go b/entc/integration/gremlin/ent/goods_query.go index 039b7c097..c848a461b 100644 --- a/entc/integration/gremlin/ent/goods_query.go +++ b/entc/integration/gremlin/ent/goods_query.go @@ -249,6 +249,7 @@ func (gq *GoodsQuery) Clone() *GoodsQuery { // clone intermediate query. gremlin: gq.gremlin.Clone(), path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/gremlin/ent/group_query.go b/entc/integration/gremlin/ent/group_query.go index 8f2e97317..9da557ae0 100644 --- a/entc/integration/gremlin/ent/group_query.go +++ b/entc/integration/gremlin/ent/group_query.go @@ -315,6 +315,7 @@ func (gq *GroupQuery) Clone() *GroupQuery { // clone intermediate query. gremlin: gq.gremlin.Clone(), path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/gremlin/ent/groupinfo_query.go b/entc/integration/gremlin/ent/groupinfo_query.go index 13914bb52..927763ecb 100644 --- a/entc/integration/gremlin/ent/groupinfo_query.go +++ b/entc/integration/gremlin/ent/groupinfo_query.go @@ -267,6 +267,7 @@ func (giq *GroupInfoQuery) Clone() *GroupInfoQuery { // clone intermediate query. gremlin: giq.gremlin.Clone(), path: giq.path, + unique: giq.unique, } } diff --git a/entc/integration/gremlin/ent/item_query.go b/entc/integration/gremlin/ent/item_query.go index f42b06975..16eb160ae 100644 --- a/entc/integration/gremlin/ent/item_query.go +++ b/entc/integration/gremlin/ent/item_query.go @@ -249,6 +249,7 @@ func (iq *ItemQuery) Clone() *ItemQuery { // clone intermediate query. gremlin: iq.gremlin.Clone(), path: iq.path, + unique: iq.unique, } } diff --git a/entc/integration/gremlin/ent/node_query.go b/entc/integration/gremlin/ent/node_query.go index 8355b2bcb..ffd957f1b 100644 --- a/entc/integration/gremlin/ent/node_query.go +++ b/entc/integration/gremlin/ent/node_query.go @@ -282,6 +282,7 @@ func (nq *NodeQuery) Clone() *NodeQuery { // clone intermediate query. gremlin: nq.gremlin.Clone(), path: nq.path, + unique: nq.unique, } } diff --git a/entc/integration/gremlin/ent/pet_query.go b/entc/integration/gremlin/ent/pet_query.go index 5017f3001..b31a49c43 100644 --- a/entc/integration/gremlin/ent/pet_query.go +++ b/entc/integration/gremlin/ent/pet_query.go @@ -283,6 +283,7 @@ func (pq *PetQuery) Clone() *PetQuery { // clone intermediate query. gremlin: pq.gremlin.Clone(), path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/gremlin/ent/spec_query.go b/entc/integration/gremlin/ent/spec_query.go index b0aa1e438..94878a532 100644 --- a/entc/integration/gremlin/ent/spec_query.go +++ b/entc/integration/gremlin/ent/spec_query.go @@ -266,6 +266,7 @@ func (sq *SpecQuery) Clone() *SpecQuery { // clone intermediate query. gremlin: sq.gremlin.Clone(), path: sq.path, + unique: sq.unique, } } diff --git a/entc/integration/gremlin/ent/task_query.go b/entc/integration/gremlin/ent/task_query.go index 118bb93bb..270576c72 100644 --- a/entc/integration/gremlin/ent/task_query.go +++ b/entc/integration/gremlin/ent/task_query.go @@ -250,6 +250,7 @@ func (tq *TaskQuery) Clone() *TaskQuery { // clone intermediate query. gremlin: tq.gremlin.Clone(), path: tq.path, + unique: tq.unique, } } diff --git a/entc/integration/gremlin/ent/user_query.go b/entc/integration/gremlin/ent/user_query.go index f221077ff..9467ce43a 100644 --- a/entc/integration/gremlin/ent/user_query.go +++ b/entc/integration/gremlin/ent/user_query.go @@ -426,6 +426,7 @@ func (uq *UserQuery) Clone() *UserQuery { // clone intermediate query. gremlin: uq.gremlin.Clone(), path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index edd6dfc60..ae9ae0f55 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -273,8 +273,9 @@ func (cq *CardQuery) Clone() *CardQuery { predicates: append([]predicate.Card{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index fc5f899b3..59fa9ee0f 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -322,8 +322,9 @@ func (uq *UserQuery) Clone() *UserQuery { withFriends: uq.withFriends.Clone(), withBestFriend: uq.withBestFriend.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index c65bc0550..4454caa9b 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -321,8 +321,9 @@ func (uq *UserQuery) Clone() *UserQuery { withFollowers: uq.withFollowers.Clone(), withFollowing: uq.withFollowing.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index 738afd8ae..c08f91755 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -246,8 +246,9 @@ func (uq *UserQuery) Clone() *UserQuery { order: append([]OrderFunc{}, uq.order...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/migrate/entv1/car_query.go b/entc/integration/migrate/entv1/car_query.go index 061fe8902..481b4160a 100644 --- a/entc/integration/migrate/entv1/car_query.go +++ b/entc/integration/migrate/entv1/car_query.go @@ -273,8 +273,9 @@ func (cq *CarQuery) Clone() *CarQuery { predicates: append([]predicate.Car{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/migrate/entv1/conversion_query.go b/entc/integration/migrate/entv1/conversion_query.go index 48f2ad1e5..badfa9d93 100644 --- a/entc/integration/migrate/entv1/conversion_query.go +++ b/entc/integration/migrate/entv1/conversion_query.go @@ -246,8 +246,9 @@ func (cq *ConversionQuery) Clone() *ConversionQuery { order: append([]OrderFunc{}, cq.order...), predicates: append([]predicate.Conversion{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/migrate/entv1/customtype_query.go b/entc/integration/migrate/entv1/customtype_query.go index b434d7098..5bb6909fc 100644 --- a/entc/integration/migrate/entv1/customtype_query.go +++ b/entc/integration/migrate/entv1/customtype_query.go @@ -246,8 +246,9 @@ func (ctq *CustomTypeQuery) Clone() *CustomTypeQuery { order: append([]OrderFunc{}, ctq.order...), predicates: append([]predicate.CustomType{}, ctq.predicates...), // clone intermediate query. - sql: ctq.sql.Clone(), - path: ctq.path, + sql: ctq.sql.Clone(), + path: ctq.path, + unique: ctq.unique, } } diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index 0752281a8..6eec60adf 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -346,8 +346,9 @@ func (uq *UserQuery) Clone() *UserQuery { withSpouse: uq.withSpouse.Clone(), withCar: uq.withCar.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index 50743ba74..96e30b523 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -273,8 +273,9 @@ func (cq *CarQuery) Clone() *CarQuery { predicates: append([]predicate.Car{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/migrate/entv2/conversion_query.go b/entc/integration/migrate/entv2/conversion_query.go index 11108dd57..ae32a954c 100644 --- a/entc/integration/migrate/entv2/conversion_query.go +++ b/entc/integration/migrate/entv2/conversion_query.go @@ -246,8 +246,9 @@ func (cq *ConversionQuery) Clone() *ConversionQuery { order: append([]OrderFunc{}, cq.order...), predicates: append([]predicate.Conversion{}, cq.predicates...), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/entc/integration/migrate/entv2/customtype_query.go b/entc/integration/migrate/entv2/customtype_query.go index 2ae0bc4dc..20e2b7b70 100644 --- a/entc/integration/migrate/entv2/customtype_query.go +++ b/entc/integration/migrate/entv2/customtype_query.go @@ -246,8 +246,9 @@ func (ctq *CustomTypeQuery) Clone() *CustomTypeQuery { order: append([]OrderFunc{}, ctq.order...), predicates: append([]predicate.CustomType{}, ctq.predicates...), // clone intermediate query. - sql: ctq.sql.Clone(), - path: ctq.path, + sql: ctq.sql.Clone(), + path: ctq.path, + unique: ctq.unique, } } diff --git a/entc/integration/migrate/entv2/group_query.go b/entc/integration/migrate/entv2/group_query.go index 5b06c71ab..771d9b3a6 100644 --- a/entc/integration/migrate/entv2/group_query.go +++ b/entc/integration/migrate/entv2/group_query.go @@ -246,8 +246,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { order: append([]OrderFunc{}, gq.order...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/migrate/entv2/media_query.go b/entc/integration/migrate/entv2/media_query.go index bda2c3008..21d9b75c1 100644 --- a/entc/integration/migrate/entv2/media_query.go +++ b/entc/integration/migrate/entv2/media_query.go @@ -246,8 +246,9 @@ func (mq *MediaQuery) Clone() *MediaQuery { order: append([]OrderFunc{}, mq.order...), predicates: append([]predicate.Media{}, mq.predicates...), // clone intermediate query. - sql: mq.sql.Clone(), - path: mq.path, + sql: mq.sql.Clone(), + path: mq.path, + unique: mq.unique, } } diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index 3a5786774..ba6b5f571 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -273,8 +273,9 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index 5299b135e..de0203e94 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -322,8 +322,9 @@ func (uq *UserQuery) Clone() *UserQuery { withPets: uq.withPets.Clone(), withFriends: uq.withFriends.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/multischema/ent/group_query.go b/entc/integration/multischema/ent/group_query.go index 8aceb1aab..d3bacd872 100644 --- a/entc/integration/multischema/ent/group_query.go +++ b/entc/integration/multischema/ent/group_query.go @@ -278,8 +278,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { predicates: append([]predicate.Group{}, gq.predicates...), withUsers: gq.withUsers.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/multischema/ent/pet_query.go b/entc/integration/multischema/ent/pet_query.go index d4e3bd140..ca62f3e85 100644 --- a/entc/integration/multischema/ent/pet_query.go +++ b/entc/integration/multischema/ent/pet_query.go @@ -277,8 +277,9 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/multischema/ent/user_query.go b/entc/integration/multischema/ent/user_query.go index d6c659eeb..2f417ae67 100644 --- a/entc/integration/multischema/ent/user_query.go +++ b/entc/integration/multischema/ent/user_query.go @@ -306,8 +306,9 @@ func (uq *UserQuery) Clone() *UserQuery { withPets: uq.withPets.Clone(), withGroups: uq.withGroups.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/privacy/ent/task_query.go b/entc/integration/privacy/ent/task_query.go index cc322c634..7271968cd 100644 --- a/entc/integration/privacy/ent/task_query.go +++ b/entc/integration/privacy/ent/task_query.go @@ -299,8 +299,9 @@ func (tq *TaskQuery) Clone() *TaskQuery { withTeams: tq.withTeams.Clone(), withOwner: tq.withOwner.Clone(), // clone intermediate query. - sql: tq.sql.Clone(), - path: tq.path, + sql: tq.sql.Clone(), + path: tq.path, + unique: tq.unique, } } diff --git a/entc/integration/privacy/ent/team_query.go b/entc/integration/privacy/ent/team_query.go index 1efc3c868..0b9d346d9 100644 --- a/entc/integration/privacy/ent/team_query.go +++ b/entc/integration/privacy/ent/team_query.go @@ -298,8 +298,9 @@ func (tq *TeamQuery) Clone() *TeamQuery { withTasks: tq.withTasks.Clone(), withUsers: tq.withUsers.Clone(), // clone intermediate query. - sql: tq.sql.Clone(), - path: tq.path, + sql: tq.sql.Clone(), + path: tq.path, + unique: tq.unique, } } diff --git a/entc/integration/privacy/ent/user_query.go b/entc/integration/privacy/ent/user_query.go index 86adac55f..2bb6a03a6 100644 --- a/entc/integration/privacy/ent/user_query.go +++ b/entc/integration/privacy/ent/user_query.go @@ -298,8 +298,9 @@ func (uq *UserQuery) Clone() *UserQuery { withTeams: uq.withTeams.Clone(), withTasks: uq.withTasks.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index 128a08113..3130977a2 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -249,8 +249,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { order: append([]OrderFunc{}, gq.order...), predicates: append([]predicate.Group{}, gq.predicates...), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index fce7f0301..241249cb1 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -276,8 +276,9 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index c6ec17900..bc8720491 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -300,8 +300,9 @@ func (uq *UserQuery) Clone() *UserQuery { withPets: uq.withPets.Clone(), withFriends: uq.withFriends.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index 172f4c117..4d5bc8ca3 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -273,8 +273,9 @@ func (cq *CityQuery) Clone() *CityQuery { predicates: append([]predicate.City{}, cq.predicates...), withStreets: cq.withStreets.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index 23c068b07..b34f68804 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -273,8 +273,9 @@ func (sq *StreetQuery) Clone() *StreetQuery { predicates: append([]predicate.Street{}, sq.predicates...), withCity: sq.withCity.Clone(), // clone intermediate query. - sql: sq.sql.Clone(), - path: sq.path, + sql: sq.sql.Clone(), + path: sq.path, + unique: sq.unique, } } diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index bdc9de67f..5dc82fbc1 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -246,8 +246,9 @@ func (uq *UserQuery) Clone() *UserQuery { order: append([]OrderFunc{}, uq.order...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/fs/ent/file_query.go b/examples/fs/ent/file_query.go index c9c7c8f31..f094e00c6 100644 --- a/examples/fs/ent/file_query.go +++ b/examples/fs/ent/file_query.go @@ -296,8 +296,9 @@ func (fq *FileQuery) Clone() *FileQuery { withParent: fq.withParent.Clone(), withChildren: fq.withChildren.Clone(), // clone intermediate query. - sql: fq.sql.Clone(), - path: fq.path, + sql: fq.sql.Clone(), + path: fq.path, + unique: fq.unique, } } diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index 391b6c3ad..9deee5874 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -273,8 +273,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { predicates: append([]predicate.Group{}, gq.predicates...), withUsers: gq.withUsers.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index aeb39a67e..3bc8b6549 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -273,8 +273,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withGroups: uq.withGroups.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index 14391a70f..1a685d4f7 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -272,8 +272,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withFriends: uq.withFriends.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index 4903da7bb..de6a52cd0 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -296,8 +296,9 @@ func (uq *UserQuery) Clone() *UserQuery { withFollowers: uq.withFollowers.Clone(), withFollowing: uq.withFollowing.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index 06c5beeef..7c87a83d1 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -273,8 +273,9 @@ func (pq *PetQuery) Clone() *PetQuery { predicates: append([]predicate.Pet{}, pq.predicates...), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 28361e97d..feee4c824 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -273,8 +273,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withPets: uq.withPets.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index a1af262d8..ef6830b73 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -297,8 +297,9 @@ func (nq *NodeQuery) Clone() *NodeQuery { withParent: nq.withParent.Clone(), withChildren: nq.withChildren.Clone(), // clone intermediate query. - sql: nq.sql.Clone(), - path: nq.path, + sql: nq.sql.Clone(), + path: nq.path, + unique: nq.unique, } } diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index c7072b2d6..17dac8492 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -273,8 +273,9 @@ func (cq *CardQuery) Clone() *CardQuery { predicates: append([]predicate.Card{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index c3b5ceb88..1ccec4793 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -273,8 +273,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withCard: uq.withCard.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index d2f132320..e6727979c 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -272,8 +272,9 @@ func (uq *UserQuery) Clone() *UserQuery { predicates: append([]predicate.User{}, uq.predicates...), withSpouse: uq.withSpouse.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index a328e2d29..830bcc992 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -297,8 +297,9 @@ func (nq *NodeQuery) Clone() *NodeQuery { withPrev: nq.withPrev.Clone(), withNext: nq.withNext.Clone(), // clone intermediate query. - sql: nq.sql.Clone(), - path: nq.path, + sql: nq.sql.Clone(), + path: nq.path, + unique: nq.unique, } } diff --git a/examples/privacyadmin/ent/user_query.go b/examples/privacyadmin/ent/user_query.go index 8bbee8d73..7f943a2f6 100644 --- a/examples/privacyadmin/ent/user_query.go +++ b/examples/privacyadmin/ent/user_query.go @@ -246,8 +246,9 @@ func (uq *UserQuery) Clone() *UserQuery { order: append([]OrderFunc{}, uq.order...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/privacytenant/ent/group_query.go b/examples/privacytenant/ent/group_query.go index f5cf62a16..c43495acf 100644 --- a/examples/privacytenant/ent/group_query.go +++ b/examples/privacytenant/ent/group_query.go @@ -299,8 +299,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { withTenant: gq.withTenant.Clone(), withUsers: gq.withUsers.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/examples/privacytenant/ent/tenant_query.go b/examples/privacytenant/ent/tenant_query.go index 6cb1fde39..e126b3617 100644 --- a/examples/privacytenant/ent/tenant_query.go +++ b/examples/privacytenant/ent/tenant_query.go @@ -246,8 +246,9 @@ func (tq *TenantQuery) Clone() *TenantQuery { order: append([]OrderFunc{}, tq.order...), predicates: append([]predicate.Tenant{}, tq.predicates...), // clone intermediate query. - sql: tq.sql.Clone(), - path: tq.path, + sql: tq.sql.Clone(), + path: tq.path, + unique: tq.unique, } } diff --git a/examples/privacytenant/ent/user_query.go b/examples/privacytenant/ent/user_query.go index 56ed65258..aeed75f73 100644 --- a/examples/privacytenant/ent/user_query.go +++ b/examples/privacytenant/ent/user_query.go @@ -299,8 +299,9 @@ func (uq *UserQuery) Clone() *UserQuery { withTenant: uq.withTenant.Clone(), withGroups: uq.withGroups.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index aa10c88e9..743d8b75c 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -273,8 +273,9 @@ func (cq *CarQuery) Clone() *CarQuery { predicates: append([]predicate.Car{}, cq.predicates...), withOwner: cq.withOwner.Clone(), // clone intermediate query. - sql: cq.sql.Clone(), - path: cq.path, + sql: cq.sql.Clone(), + path: cq.path, + unique: cq.unique, } } diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index ec38319f2..ff45f0c9c 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -273,8 +273,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { predicates: append([]predicate.Group{}, gq.predicates...), withUsers: gq.withUsers.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index 8b44894ff..15bd651a7 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -298,8 +298,9 @@ func (uq *UserQuery) Clone() *UserQuery { withCars: uq.withCars.Clone(), withGroups: uq.withGroups.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 5f196cf5d..26d2ebdf3 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -298,8 +298,9 @@ func (gq *GroupQuery) Clone() *GroupQuery { withUsers: gq.withUsers.Clone(), withAdmin: gq.withAdmin.Clone(), // clone intermediate query. - sql: gq.sql.Clone(), - path: gq.path, + sql: gq.sql.Clone(), + path: gq.path, + unique: gq.unique, } } diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index da2516f38..8897a2145 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -298,8 +298,9 @@ func (pq *PetQuery) Clone() *PetQuery { withFriends: pq.withFriends.Clone(), withOwner: pq.withOwner.Clone(), // clone intermediate query. - sql: pq.sql.Clone(), - path: pq.path, + sql: pq.sql.Clone(), + path: pq.path, + unique: pq.unique, } } diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 382311e72..48ecb49ff 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -346,8 +346,9 @@ func (uq *UserQuery) Clone() *UserQuery { withGroups: uq.withGroups.Clone(), withManage: uq.withManage.Clone(), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } } diff --git a/examples/version/ent/user_query.go b/examples/version/ent/user_query.go index 15a4f327f..ba7c84455 100644 --- a/examples/version/ent/user_query.go +++ b/examples/version/ent/user_query.go @@ -246,8 +246,9 @@ func (uq *UserQuery) Clone() *UserQuery { order: append([]OrderFunc{}, uq.order...), predicates: append([]predicate.User{}, uq.predicates...), // clone intermediate query. - sql: uq.sql.Clone(), - path: uq.path, + sql: uq.sql.Clone(), + path: uq.path, + unique: uq.unique, } }