From 547652a868be8ffec8f2cc00e03ef5e007994b2c Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 4 Aug 2022 16:12:38 +0530 Subject: [PATCH 1/2] bumped pkg golang.org/x/tools version to address issue #2826 --- go.mod | 8 ++++---- go.sum | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 681be7ff84..6929f75dcc 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 go.opencensus.io v0.23.0 - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7 + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 + golang.org/x/tools v0.1.12 ) require ( @@ -38,8 +38,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/zclconf/go-cty v1.8.0 // indirect - golang.org/x/mod v0.5.1 // indirect - golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/go.sum b/go.sum index e3e5c013d8..73ef861d7f 100644 --- a/go.sum +++ b/go.sum @@ -144,6 +144,7 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -161,6 +162,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -172,6 +174,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -188,6 +191,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7 h1:M1gcVrIb2lSn2FIL19DG0+/b8nNVKJ7W7b4WcAGZAYM= golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 19ac8271170524bb926baae0c22b0a35f2ebd9b2 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki Date: Thu, 4 Aug 2022 23:27:24 +0300 Subject: [PATCH 2/2] .github: update go1.19 in go generate --- .github/workflows/ci.yml | 8 ++-- .golangci.yml | 6 +-- entc/integration/cascadelete/ent/client.go | 1 - .../cascadelete/ent/comment_query.go | 2 - entc/integration/cascadelete/ent/ent.go | 1 - entc/integration/cascadelete/ent/hook/hook.go | 4 -- .../cascadelete/ent/migrate/migrate.go | 5 +- .../integration/cascadelete/ent/post_query.go | 2 - .../integration/cascadelete/ent/user_query.go | 2 - entc/integration/config/ent/client.go | 1 - entc/integration/config/ent/ent.go | 1 - entc/integration/config/ent/hook/hook.go | 4 -- .../integration/config/ent/migrate/migrate.go | 5 +- entc/integration/config/ent/user_query.go | 2 - .../customid/ent/account_create.go | 14 ++---- .../integration/customid/ent/account_query.go | 2 - entc/integration/customid/ent/blob_create.go | 14 ++---- entc/integration/customid/ent/blob_query.go | 2 - .../customid/ent/bloblink_create.go | 14 ++---- .../customid/ent/bloblink_query.go | 2 - entc/integration/customid/ent/car_create.go | 14 ++---- entc/integration/customid/ent/car_query.go | 2 - entc/integration/customid/ent/client.go | 1 - .../integration/customid/ent/device_create.go | 14 ++---- entc/integration/customid/ent/doc_create.go | 14 ++---- entc/integration/customid/ent/doc_query.go | 2 - entc/integration/customid/ent/ent.go | 1 - entc/integration/customid/ent/group_create.go | 14 ++---- entc/integration/customid/ent/hook/hook.go | 4 -- .../integration/customid/ent/intsid_create.go | 14 ++---- .../customid/ent/migrate/migrate.go | 5 +- .../customid/ent/mixinid_create.go | 14 ++---- .../integration/customid/ent/mixinid_query.go | 2 - entc/integration/customid/ent/note_create.go | 14 ++---- entc/integration/customid/ent/note_query.go | 2 - entc/integration/customid/ent/other_create.go | 14 ++---- entc/integration/customid/ent/pet_create.go | 14 ++---- .../customid/ent/revision_create.go | 14 ++---- .../customid/ent/session_create.go | 14 ++---- entc/integration/customid/ent/token_create.go | 14 ++---- entc/integration/customid/ent/token_query.go | 2 - entc/integration/customid/ent/user_create.go | 14 ++---- entc/integration/edgefield/ent/car_query.go | 2 - entc/integration/edgefield/ent/card_query.go | 2 - entc/integration/edgefield/ent/client.go | 1 - entc/integration/edgefield/ent/ent.go | 1 - entc/integration/edgefield/ent/hook/hook.go | 4 -- entc/integration/edgefield/ent/info_query.go | 2 - .../edgefield/ent/metadata_query.go | 2 - .../edgefield/ent/migrate/migrate.go | 5 +- entc/integration/edgefield/ent/node_query.go | 2 - entc/integration/edgefield/ent/pet_query.go | 2 - entc/integration/edgefield/ent/post_query.go | 2 - .../integration/edgefield/ent/rental_query.go | 2 - entc/integration/edgefield/ent/user_query.go | 2 - entc/integration/edgeschema/ent/client.go | 1 - entc/integration/edgeschema/ent/ent.go | 1 - .../edgeschema/ent/friendship_create.go | 14 ++---- .../edgeschema/ent/friendship_query.go | 2 - .../edgeschema/ent/group_create.go | 14 ++---- .../integration/edgeschema/ent/group_query.go | 2 - entc/integration/edgeschema/ent/hook/hook.go | 4 -- .../edgeschema/ent/migrate/migrate.go | 5 +- .../edgeschema/ent/relationship_create.go | 14 ++---- .../edgeschema/ent/relationship_query.go | 2 - .../edgeschema/ent/relationshipinfo_create.go | 14 ++---- .../edgeschema/ent/relationshipinfo_query.go | 2 - .../integration/edgeschema/ent/role_create.go | 14 ++---- entc/integration/edgeschema/ent/role_query.go | 2 - .../edgeschema/ent/roleuser_create.go | 14 ++---- .../edgeschema/ent/roleuser_query.go | 2 - entc/integration/edgeschema/ent/tag_create.go | 14 ++---- entc/integration/edgeschema/ent/tag_query.go | 2 - .../edgeschema/ent/tweet_create.go | 14 ++---- .../integration/edgeschema/ent/tweet_query.go | 2 - .../edgeschema/ent/tweetlike/tweetlike.go | 1 - .../edgeschema/ent/tweetlike_create.go | 14 ++---- .../edgeschema/ent/tweetlike_query.go | 2 - .../edgeschema/ent/tweettag_create.go | 14 ++---- .../edgeschema/ent/tweettag_query.go | 2 - entc/integration/edgeschema/ent/user/user.go | 1 - .../integration/edgeschema/ent/user_create.go | 14 ++---- entc/integration/edgeschema/ent/user_query.go | 2 - .../edgeschema/ent/usergroup_create.go | 14 ++---- .../edgeschema/ent/usergroup_query.go | 2 - .../edgeschema/ent/usertweet_create.go | 14 ++---- .../edgeschema/ent/usertweet_query.go | 2 - entc/integration/ent/card_create.go | 14 ++---- entc/integration/ent/card_query.go | 2 - entc/integration/ent/client.go | 1 - entc/integration/ent/comment_create.go | 14 ++---- entc/integration/ent/comment_query.go | 2 - entc/integration/ent/ent.go | 1 - entc/integration/ent/fieldtype_create.go | 14 ++---- entc/integration/ent/fieldtype_query.go | 2 - entc/integration/ent/file_create.go | 14 ++---- entc/integration/ent/file_query.go | 2 - entc/integration/ent/filetype_create.go | 14 ++---- entc/integration/ent/filetype_query.go | 2 - entc/integration/ent/goods_create.go | 14 ++---- entc/integration/ent/group_create.go | 14 ++---- entc/integration/ent/group_query.go | 2 - entc/integration/ent/groupinfo_create.go | 14 ++---- entc/integration/ent/groupinfo_query.go | 2 - entc/integration/ent/hook/hook.go | 4 -- entc/integration/ent/item_create.go | 14 ++---- entc/integration/ent/item_query.go | 2 - entc/integration/ent/license_create.go | 14 ++---- entc/integration/ent/migrate/migrate.go | 5 +- entc/integration/ent/node_create.go | 14 ++---- entc/integration/ent/node_query.go | 2 - entc/integration/ent/pet_create.go | 14 ++---- entc/integration/ent/pet_query.go | 2 - entc/integration/ent/spec_create.go | 14 ++---- entc/integration/ent/task_create.go | 14 ++---- entc/integration/ent/task_query.go | 2 - entc/integration/ent/user_create.go | 14 ++---- entc/integration/ent/user_query.go | 2 - entc/integration/gremlin/ent/card_query.go | 2 - entc/integration/gremlin/ent/client.go | 1 - entc/integration/gremlin/ent/comment_query.go | 2 - entc/integration/gremlin/ent/ent.go | 1 - .../gremlin/ent/fieldtype_query.go | 2 - entc/integration/gremlin/ent/file_query.go | 2 - .../integration/gremlin/ent/filetype_query.go | 2 - entc/integration/gremlin/ent/group_query.go | 2 - .../gremlin/ent/groupinfo_query.go | 2 - entc/integration/gremlin/ent/hook/hook.go | 4 -- entc/integration/gremlin/ent/item_query.go | 2 - entc/integration/gremlin/ent/node_query.go | 2 - entc/integration/gremlin/ent/pet_query.go | 2 - entc/integration/gremlin/ent/task_query.go | 2 - entc/integration/gremlin/ent/user_query.go | 2 - entc/integration/hooks/ent/card/card.go | 1 - entc/integration/hooks/ent/card_query.go | 2 - entc/integration/hooks/ent/client.go | 1 - entc/integration/hooks/ent/ent.go | 1 - entc/integration/hooks/ent/hook/hook.go | 4 -- entc/integration/hooks/ent/migrate/migrate.go | 5 +- entc/integration/hooks/ent/user/user.go | 1 - entc/integration/hooks/ent/user_query.go | 2 - entc/integration/idtype/ent/client.go | 1 - entc/integration/idtype/ent/ent.go | 1 - entc/integration/idtype/ent/hook/hook.go | 4 -- .../integration/idtype/ent/migrate/migrate.go | 5 +- entc/integration/idtype/ent/user_query.go | 2 - entc/integration/json/ent/client.go | 1 - entc/integration/json/ent/ent.go | 1 - entc/integration/json/ent/hook/hook.go | 4 -- entc/integration/json/ent/migrate/migrate.go | 5 +- entc/integration/json/ent/user_query.go | 2 - entc/integration/migrate/entv1/client.go | 1 - .../migrate/entv1/conversion_query.go | 2 - .../migrate/entv1/customtype_query.go | 2 - entc/integration/migrate/entv1/ent.go | 1 - entc/integration/migrate/entv1/hook/hook.go | 4 -- .../migrate/entv1/migrate/migrate.go | 5 +- entc/integration/migrate/entv1/user_query.go | 2 - entc/integration/migrate/entv2/car_query.go | 2 - entc/integration/migrate/entv2/client.go | 1 - .../migrate/entv2/conversion_query.go | 2 - .../migrate/entv2/customtype_query.go | 2 - entc/integration/migrate/entv2/ent.go | 1 - entc/integration/migrate/entv2/hook/hook.go | 4 -- entc/integration/migrate/entv2/media_query.go | 2 - .../migrate/entv2/migrate/migrate.go | 5 +- entc/integration/migrate/entv2/pet_query.go | 2 - entc/integration/migrate/entv2/user_query.go | 2 - entc/integration/migrate/versioned/client.go | 1 - entc/integration/migrate/versioned/ent.go | 1 - .../migrate/versioned/group_query.go | 2 - .../migrate/versioned/hook/hook.go | 4 -- .../migrate/versioned/migrate/migrate.go | 5 +- .../migrate/versioned/user_query.go | 2 - entc/integration/multischema/ent/client.go | 1 - entc/integration/multischema/ent/ent.go | 1 - .../multischema/ent/group_query.go | 2 - entc/integration/multischema/ent/hook/hook.go | 4 -- .../multischema/ent/migrate/migrate.go | 5 +- entc/integration/multischema/ent/pet_query.go | 2 - .../integration/multischema/ent/user_query.go | 2 - entc/integration/privacy/ent/client.go | 1 - entc/integration/privacy/ent/ent.go | 1 - entc/integration/privacy/ent/hook/hook.go | 4 -- .../privacy/ent/migrate/migrate.go | 5 +- entc/integration/privacy/ent/task/task.go | 1 - entc/integration/privacy/ent/task_query.go | 2 - entc/integration/privacy/ent/team/team.go | 1 - entc/integration/privacy/ent/team_query.go | 2 - entc/integration/privacy/ent/user/user.go | 1 - entc/integration/privacy/ent/user_query.go | 2 - entc/integration/template/ent/client.go | 1 - entc/integration/template/ent/ent.go | 1 - entc/integration/template/ent/group_query.go | 2 - entc/integration/template/ent/hook/hook.go | 4 -- .../template/ent/migrate/migrate.go | 5 +- entc/integration/template/ent/pet_query.go | 2 - entc/integration/template/ent/user_query.go | 2 - examples/edgeindex/ent/city_query.go | 2 - examples/edgeindex/ent/client.go | 1 - examples/edgeindex/ent/ent.go | 1 - examples/edgeindex/ent/hook/hook.go | 4 -- examples/edgeindex/ent/migrate/migrate.go | 5 +- examples/edgeindex/ent/street_query.go | 2 - examples/entcpkg/ent/client.go | 1 - examples/entcpkg/ent/ent.go | 1 - examples/entcpkg/ent/hook/hook.go | 4 -- examples/entcpkg/ent/migrate/migrate.go | 5 +- examples/entcpkg/ent/user_query.go | 2 - examples/fs/ent/client.go | 1 - examples/fs/ent/ent.go | 1 - examples/fs/ent/file_query.go | 2 - examples/fs/ent/hook/hook.go | 4 -- examples/fs/ent/migrate/migrate.go | 5 +- examples/m2m2types/ent/client.go | 1 - examples/m2m2types/ent/ent.go | 1 - examples/m2m2types/ent/group_query.go | 2 - examples/m2m2types/ent/hook/hook.go | 4 -- examples/m2m2types/ent/migrate/migrate.go | 5 +- examples/m2m2types/ent/user_query.go | 2 - examples/m2mbidi/ent/client.go | 1 - examples/m2mbidi/ent/ent.go | 1 - examples/m2mbidi/ent/hook/hook.go | 4 -- examples/m2mbidi/ent/migrate/migrate.go | 5 +- examples/m2mbidi/ent/user_query.go | 2 - examples/m2mrecur/ent/client.go | 1 - examples/m2mrecur/ent/ent.go | 1 - examples/m2mrecur/ent/hook/hook.go | 4 -- examples/m2mrecur/ent/migrate/migrate.go | 5 +- examples/m2mrecur/ent/user_query.go | 2 - examples/o2m2types/ent/client.go | 1 - examples/o2m2types/ent/ent.go | 1 - examples/o2m2types/ent/hook/hook.go | 4 -- examples/o2m2types/ent/migrate/migrate.go | 5 +- examples/o2m2types/ent/pet_query.go | 2 - examples/o2m2types/ent/user_query.go | 2 - examples/o2mrecur/ent/client.go | 1 - examples/o2mrecur/ent/ent.go | 1 - examples/o2mrecur/ent/hook/hook.go | 4 -- examples/o2mrecur/ent/migrate/migrate.go | 5 +- examples/o2mrecur/ent/node_query.go | 2 - examples/o2o2types/ent/card_query.go | 2 - examples/o2o2types/ent/client.go | 1 - examples/o2o2types/ent/ent.go | 1 - examples/o2o2types/ent/hook/hook.go | 4 -- examples/o2o2types/ent/migrate/migrate.go | 5 +- examples/o2o2types/ent/user_query.go | 2 - examples/o2obidi/ent/client.go | 1 - examples/o2obidi/ent/ent.go | 1 - examples/o2obidi/ent/hook/hook.go | 4 -- examples/o2obidi/ent/migrate/migrate.go | 5 +- examples/o2obidi/ent/user_query.go | 2 - examples/o2orecur/ent/client.go | 1 - examples/o2orecur/ent/ent.go | 1 - examples/o2orecur/ent/hook/hook.go | 4 -- examples/o2orecur/ent/migrate/migrate.go | 5 +- examples/o2orecur/ent/node_query.go | 2 - examples/privacyadmin/ent/client.go | 1 - examples/privacyadmin/ent/ent.go | 1 - examples/privacyadmin/ent/hook/hook.go | 4 -- examples/privacyadmin/ent/migrate/migrate.go | 5 +- examples/privacyadmin/ent/user/user.go | 1 - examples/privacyadmin/ent/user_query.go | 2 - examples/privacytenant/ent/client.go | 1 - examples/privacytenant/ent/ent.go | 1 - examples/privacytenant/ent/group/group.go | 1 - examples/privacytenant/ent/group_query.go | 2 - examples/privacytenant/ent/hook/hook.go | 4 -- examples/privacytenant/ent/migrate/migrate.go | 5 +- examples/privacytenant/ent/tenant/tenant.go | 1 - examples/privacytenant/ent/tenant_query.go | 2 - examples/privacytenant/ent/user/user.go | 1 - examples/privacytenant/ent/user_query.go | 2 - examples/start/ent/car_query.go | 2 - examples/start/ent/client.go | 1 - examples/start/ent/ent.go | 1 - examples/start/ent/group_query.go | 2 - examples/start/ent/hook/hook.go | 4 -- examples/start/ent/migrate/migrate.go | 5 +- examples/start/ent/user_query.go | 2 - examples/traversal/ent/client.go | 1 - examples/traversal/ent/ent.go | 1 - examples/traversal/ent/group_query.go | 2 - examples/traversal/ent/hook/hook.go | 4 -- examples/traversal/ent/migrate/migrate.go | 5 +- examples/traversal/ent/pet_query.go | 2 - examples/traversal/ent/user_query.go | 2 - examples/version/ent/client.go | 1 - examples/version/ent/ent.go | 1 - examples/version/ent/hook/hook.go | 4 -- examples/version/ent/migrate/migrate.go | 5 +- examples/version/ent/user_query.go | 2 - go.mod | 4 +- go.sum | 7 +++ schema/field/numeric.go | 46 ------------------- 295 files changed, 210 insertions(+), 1051 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9f9ce692e..2e727ae3df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,17 +16,17 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.17 + go-version: 1.19 - name: Run linters uses: golangci/golangci-lint-action@v3.2.0 with: - version: v1.46.2 + version: v1.48.0 unit: runs-on: ubuntu-latest strategy: matrix: - go: ['1.17', '1.18'] + go: ['1.18', '1.19'] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 @@ -60,7 +60,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' - uses: actions/cache@v3 with: path: ~/go/pkg/mod diff --git a/.golangci.yml b/.golangci.yml index 12c3e2f646..8267a243de 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: - go: '1.17' + go: '1.19' timeout: 5m linters-settings: @@ -26,7 +26,7 @@ linters: - errcheck - funlen - gocritic - - gofmt + # - gofmt; Enable back when upgrading CI to Go 1.20. - goheader - gosec - gosimple @@ -69,7 +69,7 @@ issues: - path: entc/gen/graph.go linters: - gocritic - - path: entc/integration/multischema/multischema_test.go + - path: \.go linters: - staticcheck text: SA1019 diff --git a/entc/integration/cascadelete/ent/client.go b/entc/integration/cascadelete/ent/client.go index bfdfb336be..5fd50576c9 100644 --- a/entc/integration/cascadelete/ent/client.go +++ b/entc/integration/cascadelete/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Comment. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/cascadelete/ent/comment_query.go b/entc/integration/cascadelete/ent/comment_query.go index 59b326fa6d..373103ed55 100644 --- a/entc/integration/cascadelete/ent/comment_query.go +++ b/entc/integration/cascadelete/ent/comment_query.go @@ -301,7 +301,6 @@ func (cq *CommentQuery) WithPost(opts ...func(*PostQuery)) *CommentQuery { // GroupBy(comment.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy { grbuild := &CommentGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy // client.Comment.Query(). // Select(comment.FieldText). // Scan(ctx, &v) -// func (cq *CommentQuery) Select(fields ...string) *CommentSelect { cq.fields = append(cq.fields, fields...) selbuild := &CommentSelect{CommentQuery: cq} diff --git a/entc/integration/cascadelete/ent/ent.go b/entc/integration/cascadelete/ent/ent.go index ee9622e026..ffff34cd7d 100644 --- a/entc/integration/cascadelete/ent/ent.go +++ b/entc/integration/cascadelete/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/cascadelete/ent/hook/hook.go b/entc/integration/cascadelete/ent/hook/hook.go index fb0f058b6a..8b3476da91 100644 --- a/entc/integration/cascadelete/ent/hook/hook.go +++ b/entc/integration/cascadelete/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/cascadelete/ent/migrate/migrate.go b/entc/integration/cascadelete/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/cascadelete/ent/migrate/migrate.go +++ b/entc/integration/cascadelete/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/cascadelete/ent/post_query.go b/entc/integration/cascadelete/ent/post_query.go index 09ac62df77..024ab0b70c 100644 --- a/entc/integration/cascadelete/ent/post_query.go +++ b/entc/integration/cascadelete/ent/post_query.go @@ -338,7 +338,6 @@ func (pq *PostQuery) WithComments(opts ...func(*CommentQuery)) *PostQuery { // GroupBy(post.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PostQuery) GroupBy(field string, fields ...string) *PostGroupBy { grbuild := &PostGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (pq *PostQuery) GroupBy(field string, fields ...string) *PostGroupBy { // client.Post.Query(). // Select(post.FieldText). // Scan(ctx, &v) -// func (pq *PostQuery) Select(fields ...string) *PostSelect { pq.fields = append(pq.fields, fields...) selbuild := &PostSelect{PostQuery: pq} diff --git a/entc/integration/cascadelete/ent/user_query.go b/entc/integration/cascadelete/ent/user_query.go index e0040318fc..61e79347fd 100644 --- a/entc/integration/cascadelete/ent/user_query.go +++ b/entc/integration/cascadelete/ent/user_query.go @@ -302,7 +302,6 @@ func (uq *UserQuery) WithPosts(opts ...func(*PostQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/config/ent/client.go b/entc/integration/config/ent/client.go index e4eb14331d..ff32126411 100644 --- a/entc/integration/config/ent/client.go +++ b/entc/integration/config/ent/client.go @@ -104,7 +104,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/config/ent/ent.go b/entc/integration/config/ent/ent.go index d08300e7ac..a4a2e458c6 100644 --- a/entc/integration/config/ent/ent.go +++ b/entc/integration/config/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/config/ent/hook/hook.go b/entc/integration/config/ent/hook/hook.go index 990af4cf78..34ec4b55ca 100644 --- a/entc/integration/config/ent/hook/hook.go +++ b/entc/integration/config/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/config/ent/migrate/migrate.go b/entc/integration/config/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/config/ent/migrate/migrate.go +++ b/entc/integration/config/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index cce062be8d..41d22678b4 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -265,7 +265,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/customid/ent/account_create.go b/entc/integration/customid/ent/account_create.go index 775050e93a..1d7f031dd9 100644 --- a/entc/integration/customid/ent/account_create.go +++ b/entc/integration/customid/ent/account_create.go @@ -239,7 +239,6 @@ func (ac *AccountCreate) createSpec() (*Account, *sqlgraph.CreateSpec) { // SetEmail(v+v). // }). // Exec(ctx) -// func (ac *AccountCreate) OnConflict(opts ...sql.ConflictOption) *AccountUpsertOne { ac.conflict = opts return &AccountUpsertOne{ @@ -253,7 +252,6 @@ func (ac *AccountCreate) OnConflict(opts ...sql.ConflictOption) *AccountUpsertOn // client.Account.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ac *AccountCreate) OnConflictColumns(columns ...string) *AccountUpsertOne { ac.conflict = append(ac.conflict, sql.ConflictColumns(columns...)) return &AccountUpsertOne{ @@ -297,7 +295,6 @@ func (u *AccountUpsert) UpdateEmail() *AccountUpsert { // }), // ). // Exec(ctx) -// func (u *AccountUpsertOne) UpdateNewValues() *AccountUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -311,10 +308,9 @@ func (u *AccountUpsertOne) UpdateNewValues() *AccountUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Account.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Account.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *AccountUpsertOne) Ignore() *AccountUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -485,7 +481,6 @@ func (acb *AccountCreateBulk) ExecX(ctx context.Context) { // SetEmail(v+v). // }). // Exec(ctx) -// func (acb *AccountCreateBulk) OnConflict(opts ...sql.ConflictOption) *AccountUpsertBulk { acb.conflict = opts return &AccountUpsertBulk{ @@ -499,7 +494,6 @@ func (acb *AccountCreateBulk) OnConflict(opts ...sql.ConflictOption) *AccountUps // client.Account.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (acb *AccountCreateBulk) OnConflictColumns(columns ...string) *AccountUpsertBulk { acb.conflict = append(acb.conflict, sql.ConflictColumns(columns...)) return &AccountUpsertBulk{ @@ -524,7 +518,6 @@ type AccountUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *AccountUpsertBulk) UpdateNewValues() *AccountUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -544,7 +537,6 @@ func (u *AccountUpsertBulk) UpdateNewValues() *AccountUpsertBulk { // client.Account.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *AccountUpsertBulk) Ignore() *AccountUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/account_query.go b/entc/integration/customid/ent/account_query.go index 3cb9eabf48..256de93b32 100644 --- a/entc/integration/customid/ent/account_query.go +++ b/entc/integration/customid/ent/account_query.go @@ -303,7 +303,6 @@ func (aq *AccountQuery) WithToken(opts ...func(*TokenQuery)) *AccountQuery { // GroupBy(account.FieldEmail). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (aq *AccountQuery) GroupBy(field string, fields ...string) *AccountGroupBy { grbuild := &AccountGroupBy{config: aq.config} grbuild.fields = append([]string{field}, fields...) @@ -330,7 +329,6 @@ func (aq *AccountQuery) GroupBy(field string, fields ...string) *AccountGroupBy // client.Account.Query(). // Select(account.FieldEmail). // Scan(ctx, &v) -// func (aq *AccountQuery) Select(fields ...string) *AccountSelect { aq.fields = append(aq.fields, fields...) selbuild := &AccountSelect{AccountQuery: aq} diff --git a/entc/integration/customid/ent/blob_create.go b/entc/integration/customid/ent/blob_create.go index 38160eebcf..a5aa05c39b 100644 --- a/entc/integration/customid/ent/blob_create.go +++ b/entc/integration/customid/ent/blob_create.go @@ -317,7 +317,6 @@ func (bc *BlobCreate) createSpec() (*Blob, *sqlgraph.CreateSpec) { // SetUUID(v+v). // }). // Exec(ctx) -// func (bc *BlobCreate) OnConflict(opts ...sql.ConflictOption) *BlobUpsertOne { bc.conflict = opts return &BlobUpsertOne{ @@ -331,7 +330,6 @@ func (bc *BlobCreate) OnConflict(opts ...sql.ConflictOption) *BlobUpsertOne { // client.Blob.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (bc *BlobCreate) OnConflictColumns(columns ...string) *BlobUpsertOne { bc.conflict = append(bc.conflict, sql.ConflictColumns(columns...)) return &BlobUpsertOne{ @@ -393,7 +391,6 @@ func (u *BlobUpsert) AddCount(v int) *BlobUpsert { // }), // ). // Exec(ctx) -// func (u *BlobUpsertOne) UpdateNewValues() *BlobUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -407,10 +404,9 @@ func (u *BlobUpsertOne) UpdateNewValues() *BlobUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Blob.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Blob.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *BlobUpsertOne) Ignore() *BlobUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -602,7 +598,6 @@ func (bcb *BlobCreateBulk) ExecX(ctx context.Context) { // SetUUID(v+v). // }). // Exec(ctx) -// func (bcb *BlobCreateBulk) OnConflict(opts ...sql.ConflictOption) *BlobUpsertBulk { bcb.conflict = opts return &BlobUpsertBulk{ @@ -616,7 +611,6 @@ func (bcb *BlobCreateBulk) OnConflict(opts ...sql.ConflictOption) *BlobUpsertBul // client.Blob.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (bcb *BlobCreateBulk) OnConflictColumns(columns ...string) *BlobUpsertBulk { bcb.conflict = append(bcb.conflict, sql.ConflictColumns(columns...)) return &BlobUpsertBulk{ @@ -641,7 +635,6 @@ type BlobUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *BlobUpsertBulk) UpdateNewValues() *BlobUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -661,7 +654,6 @@ func (u *BlobUpsertBulk) UpdateNewValues() *BlobUpsertBulk { // client.Blob.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *BlobUpsertBulk) Ignore() *BlobUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index 85b7905b5e..a9e01aa32a 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -374,7 +374,6 @@ func (bq *BlobQuery) WithBlobLinks(opts ...func(*BlobLinkQuery)) *BlobQuery { // GroupBy(blob.FieldUUID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (bq *BlobQuery) GroupBy(field string, fields ...string) *BlobGroupBy { grbuild := &BlobGroupBy{config: bq.config} grbuild.fields = append([]string{field}, fields...) @@ -401,7 +400,6 @@ func (bq *BlobQuery) GroupBy(field string, fields ...string) *BlobGroupBy { // client.Blob.Query(). // Select(blob.FieldUUID). // Scan(ctx, &v) -// func (bq *BlobQuery) Select(fields ...string) *BlobSelect { bq.fields = append(bq.fields, fields...) selbuild := &BlobSelect{BlobQuery: bq} diff --git a/entc/integration/customid/ent/bloblink_create.go b/entc/integration/customid/ent/bloblink_create.go index ba44e931b1..f7d6c60785 100644 --- a/entc/integration/customid/ent/bloblink_create.go +++ b/entc/integration/customid/ent/bloblink_create.go @@ -251,7 +251,6 @@ func (blc *BlobLinkCreate) createSpec() (*BlobLink, *sqlgraph.CreateSpec) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (blc *BlobLinkCreate) OnConflict(opts ...sql.ConflictOption) *BlobLinkUpsertOne { blc.conflict = opts return &BlobLinkUpsertOne{ @@ -265,7 +264,6 @@ func (blc *BlobLinkCreate) OnConflict(opts ...sql.ConflictOption) *BlobLinkUpser // client.BlobLink.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (blc *BlobLinkCreate) OnConflictColumns(columns ...string) *BlobLinkUpsertOne { blc.conflict = append(blc.conflict, sql.ConflictColumns(columns...)) return &BlobLinkUpsertOne{ @@ -330,7 +328,6 @@ func (u *BlobLinkUpsert) UpdateLinkID() *BlobLinkUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *BlobLinkUpsertOne) UpdateNewValues() *BlobLinkUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -339,10 +336,9 @@ func (u *BlobLinkUpsertOne) UpdateNewValues() *BlobLinkUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.BlobLink.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.BlobLink.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *BlobLinkUpsertOne) Ignore() *BlobLinkUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -517,7 +513,6 @@ func (blcb *BlobLinkCreateBulk) ExecX(ctx context.Context) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (blcb *BlobLinkCreateBulk) OnConflict(opts ...sql.ConflictOption) *BlobLinkUpsertBulk { blcb.conflict = opts return &BlobLinkUpsertBulk{ @@ -531,7 +526,6 @@ func (blcb *BlobLinkCreateBulk) OnConflict(opts ...sql.ConflictOption) *BlobLink // client.BlobLink.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (blcb *BlobLinkCreateBulk) OnConflictColumns(columns ...string) *BlobLinkUpsertBulk { blcb.conflict = append(blcb.conflict, sql.ConflictColumns(columns...)) return &BlobLinkUpsertBulk{ @@ -553,7 +547,6 @@ type BlobLinkUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *BlobLinkUpsertBulk) UpdateNewValues() *BlobLinkUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -565,7 +558,6 @@ func (u *BlobLinkUpsertBulk) UpdateNewValues() *BlobLinkUpsertBulk { // client.BlobLink.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *BlobLinkUpsertBulk) Ignore() *BlobLinkUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/bloblink_query.go b/entc/integration/customid/ent/bloblink_query.go index a196e301b6..d63a0c6b33 100644 --- a/entc/integration/customid/ent/bloblink_query.go +++ b/entc/integration/customid/ent/bloblink_query.go @@ -267,7 +267,6 @@ func (blq *BlobLinkQuery) WithLink(opts ...func(*BlobQuery)) *BlobLinkQuery { // GroupBy(bloblink.FieldCreatedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (blq *BlobLinkQuery) GroupBy(field string, fields ...string) *BlobLinkGroupBy { grbuild := &BlobLinkGroupBy{config: blq.config} grbuild.fields = append([]string{field}, fields...) @@ -294,7 +293,6 @@ func (blq *BlobLinkQuery) GroupBy(field string, fields ...string) *BlobLinkGroup // client.BlobLink.Query(). // Select(bloblink.FieldCreatedAt). // Scan(ctx, &v) -// func (blq *BlobLinkQuery) Select(fields ...string) *BlobLinkSelect { blq.fields = append(blq.fields, fields...) selbuild := &BlobLinkSelect{BlobLinkQuery: blq} diff --git a/entc/integration/customid/ent/car_create.go b/entc/integration/customid/ent/car_create.go index c8c5776b3a..90c2b7a677 100644 --- a/entc/integration/customid/ent/car_create.go +++ b/entc/integration/customid/ent/car_create.go @@ -276,7 +276,6 @@ func (cc *CarCreate) createSpec() (*Car, *sqlgraph.CreateSpec) { // SetBeforeID(v+v). // }). // Exec(ctx) -// func (cc *CarCreate) OnConflict(opts ...sql.ConflictOption) *CarUpsertOne { cc.conflict = opts return &CarUpsertOne{ @@ -290,7 +289,6 @@ func (cc *CarCreate) OnConflict(opts ...sql.ConflictOption) *CarUpsertOne { // client.Car.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (cc *CarCreate) OnConflictColumns(columns ...string) *CarUpsertOne { cc.conflict = append(cc.conflict, sql.ConflictColumns(columns...)) return &CarUpsertOne{ @@ -382,7 +380,6 @@ func (u *CarUpsert) UpdateModel() *CarUpsert { // }), // ). // Exec(ctx) -// func (u *CarUpsertOne) UpdateNewValues() *CarUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -396,10 +393,9 @@ func (u *CarUpsertOne) UpdateNewValues() *CarUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Car.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Car.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *CarUpsertOne) Ignore() *CarUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -624,7 +620,6 @@ func (ccb *CarCreateBulk) ExecX(ctx context.Context) { // SetBeforeID(v+v). // }). // Exec(ctx) -// func (ccb *CarCreateBulk) OnConflict(opts ...sql.ConflictOption) *CarUpsertBulk { ccb.conflict = opts return &CarUpsertBulk{ @@ -638,7 +633,6 @@ func (ccb *CarCreateBulk) OnConflict(opts ...sql.ConflictOption) *CarUpsertBulk // client.Car.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ccb *CarCreateBulk) OnConflictColumns(columns ...string) *CarUpsertBulk { ccb.conflict = append(ccb.conflict, sql.ConflictColumns(columns...)) return &CarUpsertBulk{ @@ -663,7 +657,6 @@ type CarUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *CarUpsertBulk) UpdateNewValues() *CarUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -683,7 +676,6 @@ func (u *CarUpsertBulk) UpdateNewValues() *CarUpsertBulk { // client.Car.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *CarUpsertBulk) Ignore() *CarUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index 63de8f7c7d..e2abfd7c99 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -302,7 +302,6 @@ func (cq *CarQuery) WithOwner(opts ...func(*PetQuery)) *CarQuery { // GroupBy(car.FieldBeforeID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { grbuild := &CarGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { // client.Car.Query(). // Select(car.FieldBeforeID). // Scan(ctx, &v) -// func (cq *CarQuery) Select(fields ...string) *CarSelect { cq.fields = append(cq.fields, fields...) selbuild := &CarSelect{CarQuery: cq} diff --git a/entc/integration/customid/ent/client.go b/entc/integration/customid/ent/client.go index 3884e17432..7782ee6611 100644 --- a/entc/integration/customid/ent/client.go +++ b/entc/integration/customid/ent/client.go @@ -198,7 +198,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Account. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/customid/ent/device_create.go b/entc/integration/customid/ent/device_create.go index 64b6289fa5..9040354e85 100644 --- a/entc/integration/customid/ent/device_create.go +++ b/entc/integration/customid/ent/device_create.go @@ -255,7 +255,6 @@ func (dc *DeviceCreate) createSpec() (*Device, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (dc *DeviceCreate) OnConflict(opts ...sql.ConflictOption) *DeviceUpsertOne { dc.conflict = opts return &DeviceUpsertOne{ @@ -269,7 +268,6 @@ func (dc *DeviceCreate) OnConflict(opts ...sql.ConflictOption) *DeviceUpsertOne // client.Device.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (dc *DeviceCreate) OnConflictColumns(columns ...string) *DeviceUpsertOne { dc.conflict = append(dc.conflict, sql.ConflictColumns(columns...)) return &DeviceUpsertOne{ @@ -301,7 +299,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *DeviceUpsertOne) UpdateNewValues() *DeviceUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -315,10 +312,9 @@ func (u *DeviceUpsertOne) UpdateNewValues() *DeviceUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Device.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Device.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *DeviceUpsertOne) Ignore() *DeviceUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -470,7 +466,6 @@ func (dcb *DeviceCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (dcb *DeviceCreateBulk) OnConflict(opts ...sql.ConflictOption) *DeviceUpsertBulk { dcb.conflict = opts return &DeviceUpsertBulk{ @@ -484,7 +479,6 @@ func (dcb *DeviceCreateBulk) OnConflict(opts ...sql.ConflictOption) *DeviceUpser // client.Device.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (dcb *DeviceCreateBulk) OnConflictColumns(columns ...string) *DeviceUpsertBulk { dcb.conflict = append(dcb.conflict, sql.ConflictColumns(columns...)) return &DeviceUpsertBulk{ @@ -509,7 +503,6 @@ type DeviceUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *DeviceUpsertBulk) UpdateNewValues() *DeviceUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -529,7 +522,6 @@ func (u *DeviceUpsertBulk) UpdateNewValues() *DeviceUpsertBulk { // client.Device.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *DeviceUpsertBulk) Ignore() *DeviceUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/doc_create.go b/entc/integration/customid/ent/doc_create.go index eb6112bdf6..6623310f8f 100644 --- a/entc/integration/customid/ent/doc_create.go +++ b/entc/integration/customid/ent/doc_create.go @@ -316,7 +316,6 @@ func (dc *DocCreate) createSpec() (*Doc, *sqlgraph.CreateSpec) { // SetText(v+v). // }). // Exec(ctx) -// func (dc *DocCreate) OnConflict(opts ...sql.ConflictOption) *DocUpsertOne { dc.conflict = opts return &DocUpsertOne{ @@ -330,7 +329,6 @@ func (dc *DocCreate) OnConflict(opts ...sql.ConflictOption) *DocUpsertOne { // client.Doc.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (dc *DocCreate) OnConflictColumns(columns ...string) *DocUpsertOne { dc.conflict = append(dc.conflict, sql.ConflictColumns(columns...)) return &DocUpsertOne{ @@ -380,7 +378,6 @@ func (u *DocUpsert) ClearText() *DocUpsert { // }), // ). // Exec(ctx) -// func (u *DocUpsertOne) UpdateNewValues() *DocUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -394,10 +391,9 @@ func (u *DocUpsertOne) UpdateNewValues() *DocUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Doc.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Doc.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *DocUpsertOne) Ignore() *DocUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -575,7 +571,6 @@ func (dcb *DocCreateBulk) ExecX(ctx context.Context) { // SetText(v+v). // }). // Exec(ctx) -// func (dcb *DocCreateBulk) OnConflict(opts ...sql.ConflictOption) *DocUpsertBulk { dcb.conflict = opts return &DocUpsertBulk{ @@ -589,7 +584,6 @@ func (dcb *DocCreateBulk) OnConflict(opts ...sql.ConflictOption) *DocUpsertBulk // client.Doc.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (dcb *DocCreateBulk) OnConflictColumns(columns ...string) *DocUpsertBulk { dcb.conflict = append(dcb.conflict, sql.ConflictColumns(columns...)) return &DocUpsertBulk{ @@ -614,7 +608,6 @@ type DocUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *DocUpsertBulk) UpdateNewValues() *DocUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -634,7 +627,6 @@ func (u *DocUpsertBulk) UpdateNewValues() *DocUpsertBulk { // client.Doc.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *DocUpsertBulk) Ignore() *DocUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/doc_query.go b/entc/integration/customid/ent/doc_query.go index 0954d0b40e..b582fdf221 100644 --- a/entc/integration/customid/ent/doc_query.go +++ b/entc/integration/customid/ent/doc_query.go @@ -373,7 +373,6 @@ func (dq *DocQuery) WithRelated(opts ...func(*DocQuery)) *DocQuery { // GroupBy(doc.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (dq *DocQuery) GroupBy(field string, fields ...string) *DocGroupBy { grbuild := &DocGroupBy{config: dq.config} grbuild.fields = append([]string{field}, fields...) @@ -400,7 +399,6 @@ func (dq *DocQuery) GroupBy(field string, fields ...string) *DocGroupBy { // client.Doc.Query(). // Select(doc.FieldText). // Scan(ctx, &v) -// func (dq *DocQuery) Select(fields ...string) *DocSelect { dq.fields = append(dq.fields, fields...) selbuild := &DocSelect{DocQuery: dq} diff --git a/entc/integration/customid/ent/ent.go b/entc/integration/customid/ent/ent.go index b06523ab1e..9f536b9a06 100644 --- a/entc/integration/customid/ent/ent.go +++ b/entc/integration/customid/ent/ent.go @@ -115,7 +115,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/customid/ent/group_create.go b/entc/integration/customid/ent/group_create.go index 1a4bbc41a1..16606685e0 100644 --- a/entc/integration/customid/ent/group_create.go +++ b/entc/integration/customid/ent/group_create.go @@ -189,7 +189,6 @@ func (gc *GroupCreate) createSpec() (*Group, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { gc.conflict = opts return &GroupUpsertOne{ @@ -203,7 +202,6 @@ func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gc *GroupCreate) OnConflictColumns(columns ...string) *GroupUpsertOne { gc.conflict = append(gc.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertOne{ @@ -235,7 +233,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -249,10 +246,9 @@ func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Group.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Group.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *GroupUpsertOne) Ignore() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -402,7 +398,6 @@ func (gcb *GroupCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertBulk { gcb.conflict = opts return &GroupUpsertBulk{ @@ -416,7 +411,6 @@ func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertB // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflictColumns(columns ...string) *GroupUpsertBulk { gcb.conflict = append(gcb.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertBulk{ @@ -441,7 +435,6 @@ type GroupUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -461,7 +454,6 @@ func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { // client.Group.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *GroupUpsertBulk) Ignore() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/hook/hook.go b/entc/integration/customid/ent/hook/hook.go index 68dc453e9b..64b72cb2fa 100644 --- a/entc/integration/customid/ent/hook/hook.go +++ b/entc/integration/customid/ent/hook/hook.go @@ -316,7 +316,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -331,7 +330,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -339,7 +337,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -360,7 +357,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/customid/ent/intsid_create.go b/entc/integration/customid/ent/intsid_create.go index 392c9c0459..d5f845de19 100644 --- a/entc/integration/customid/ent/intsid_create.go +++ b/entc/integration/customid/ent/intsid_create.go @@ -231,7 +231,6 @@ func (isc *IntSIDCreate) createSpec() (*IntSID, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (isc *IntSIDCreate) OnConflict(opts ...sql.ConflictOption) *IntSIDUpsertOne { isc.conflict = opts return &IntSIDUpsertOne{ @@ -245,7 +244,6 @@ func (isc *IntSIDCreate) OnConflict(opts ...sql.ConflictOption) *IntSIDUpsertOne // client.IntSID.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (isc *IntSIDCreate) OnConflictColumns(columns ...string) *IntSIDUpsertOne { isc.conflict = append(isc.conflict, sql.ConflictColumns(columns...)) return &IntSIDUpsertOne{ @@ -277,7 +275,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *IntSIDUpsertOne) UpdateNewValues() *IntSIDUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -291,10 +288,9 @@ func (u *IntSIDUpsertOne) UpdateNewValues() *IntSIDUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.IntSID.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.IntSID.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *IntSIDUpsertOne) Ignore() *IntSIDUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -445,7 +441,6 @@ func (iscb *IntSIDCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (iscb *IntSIDCreateBulk) OnConflict(opts ...sql.ConflictOption) *IntSIDUpsertBulk { iscb.conflict = opts return &IntSIDUpsertBulk{ @@ -459,7 +454,6 @@ func (iscb *IntSIDCreateBulk) OnConflict(opts ...sql.ConflictOption) *IntSIDUpse // client.IntSID.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (iscb *IntSIDCreateBulk) OnConflictColumns(columns ...string) *IntSIDUpsertBulk { iscb.conflict = append(iscb.conflict, sql.ConflictColumns(columns...)) return &IntSIDUpsertBulk{ @@ -484,7 +478,6 @@ type IntSIDUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *IntSIDUpsertBulk) UpdateNewValues() *IntSIDUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -504,7 +497,6 @@ func (u *IntSIDUpsertBulk) UpdateNewValues() *IntSIDUpsertBulk { // client.IntSID.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *IntSIDUpsertBulk) Ignore() *IntSIDUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/migrate/migrate.go b/entc/integration/customid/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/customid/ent/migrate/migrate.go +++ b/entc/integration/customid/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/customid/ent/mixinid_create.go b/entc/integration/customid/ent/mixinid_create.go index 98d926b26e..d7af730a60 100644 --- a/entc/integration/customid/ent/mixinid_create.go +++ b/entc/integration/customid/ent/mixinid_create.go @@ -216,7 +216,6 @@ func (mic *MixinIDCreate) createSpec() (*MixinID, *sqlgraph.CreateSpec) { // SetSomeField(v+v). // }). // Exec(ctx) -// func (mic *MixinIDCreate) OnConflict(opts ...sql.ConflictOption) *MixinIDUpsertOne { mic.conflict = opts return &MixinIDUpsertOne{ @@ -230,7 +229,6 @@ func (mic *MixinIDCreate) OnConflict(opts ...sql.ConflictOption) *MixinIDUpsertO // client.MixinID.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (mic *MixinIDCreate) OnConflictColumns(columns ...string) *MixinIDUpsertOne { mic.conflict = append(mic.conflict, sql.ConflictColumns(columns...)) return &MixinIDUpsertOne{ @@ -286,7 +284,6 @@ func (u *MixinIDUpsert) UpdateMixinField() *MixinIDUpsert { // }), // ). // Exec(ctx) -// func (u *MixinIDUpsertOne) UpdateNewValues() *MixinIDUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -300,10 +297,9 @@ func (u *MixinIDUpsertOne) UpdateNewValues() *MixinIDUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.MixinID.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.MixinID.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *MixinIDUpsertOne) Ignore() *MixinIDUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -488,7 +484,6 @@ func (micb *MixinIDCreateBulk) ExecX(ctx context.Context) { // SetSomeField(v+v). // }). // Exec(ctx) -// func (micb *MixinIDCreateBulk) OnConflict(opts ...sql.ConflictOption) *MixinIDUpsertBulk { micb.conflict = opts return &MixinIDUpsertBulk{ @@ -502,7 +497,6 @@ func (micb *MixinIDCreateBulk) OnConflict(opts ...sql.ConflictOption) *MixinIDUp // client.MixinID.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (micb *MixinIDCreateBulk) OnConflictColumns(columns ...string) *MixinIDUpsertBulk { micb.conflict = append(micb.conflict, sql.ConflictColumns(columns...)) return &MixinIDUpsertBulk{ @@ -527,7 +521,6 @@ type MixinIDUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *MixinIDUpsertBulk) UpdateNewValues() *MixinIDUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -547,7 +540,6 @@ func (u *MixinIDUpsertBulk) UpdateNewValues() *MixinIDUpsertBulk { // client.MixinID.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *MixinIDUpsertBulk) Ignore() *MixinIDUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/mixinid_query.go b/entc/integration/customid/ent/mixinid_query.go index eedc68623e..91258cea08 100644 --- a/entc/integration/customid/ent/mixinid_query.go +++ b/entc/integration/customid/ent/mixinid_query.go @@ -266,7 +266,6 @@ func (miq *MixinIDQuery) Clone() *MixinIDQuery { // GroupBy(mixinid.FieldSomeField). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (miq *MixinIDQuery) GroupBy(field string, fields ...string) *MixinIDGroupBy { grbuild := &MixinIDGroupBy{config: miq.config} grbuild.fields = append([]string{field}, fields...) @@ -293,7 +292,6 @@ func (miq *MixinIDQuery) GroupBy(field string, fields ...string) *MixinIDGroupBy // client.MixinID.Query(). // Select(mixinid.FieldSomeField). // Scan(ctx, &v) -// func (miq *MixinIDQuery) Select(fields ...string) *MixinIDSelect { miq.fields = append(miq.fields, fields...) selbuild := &MixinIDSelect{MixinIDQuery: miq} diff --git a/entc/integration/customid/ent/note_create.go b/entc/integration/customid/ent/note_create.go index 8091c249f6..ff46fb522f 100644 --- a/entc/integration/customid/ent/note_create.go +++ b/entc/integration/customid/ent/note_create.go @@ -282,7 +282,6 @@ func (nc *NoteCreate) createSpec() (*Note, *sqlgraph.CreateSpec) { // SetText(v+v). // }). // Exec(ctx) -// func (nc *NoteCreate) OnConflict(opts ...sql.ConflictOption) *NoteUpsertOne { nc.conflict = opts return &NoteUpsertOne{ @@ -296,7 +295,6 @@ func (nc *NoteCreate) OnConflict(opts ...sql.ConflictOption) *NoteUpsertOne { // client.Note.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (nc *NoteCreate) OnConflictColumns(columns ...string) *NoteUpsertOne { nc.conflict = append(nc.conflict, sql.ConflictColumns(columns...)) return &NoteUpsertOne{ @@ -346,7 +344,6 @@ func (u *NoteUpsert) ClearText() *NoteUpsert { // }), // ). // Exec(ctx) -// func (u *NoteUpsertOne) UpdateNewValues() *NoteUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -360,10 +357,9 @@ func (u *NoteUpsertOne) UpdateNewValues() *NoteUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Note.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Note.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *NoteUpsertOne) Ignore() *NoteUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -541,7 +537,6 @@ func (ncb *NoteCreateBulk) ExecX(ctx context.Context) { // SetText(v+v). // }). // Exec(ctx) -// func (ncb *NoteCreateBulk) OnConflict(opts ...sql.ConflictOption) *NoteUpsertBulk { ncb.conflict = opts return &NoteUpsertBulk{ @@ -555,7 +550,6 @@ func (ncb *NoteCreateBulk) OnConflict(opts ...sql.ConflictOption) *NoteUpsertBul // client.Note.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ncb *NoteCreateBulk) OnConflictColumns(columns ...string) *NoteUpsertBulk { ncb.conflict = append(ncb.conflict, sql.ConflictColumns(columns...)) return &NoteUpsertBulk{ @@ -580,7 +574,6 @@ type NoteUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *NoteUpsertBulk) UpdateNewValues() *NoteUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -600,7 +593,6 @@ func (u *NoteUpsertBulk) UpdateNewValues() *NoteUpsertBulk { // client.Note.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *NoteUpsertBulk) Ignore() *NoteUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/note_query.go b/entc/integration/customid/ent/note_query.go index 5d6ee7ed73..a43884d970 100644 --- a/entc/integration/customid/ent/note_query.go +++ b/entc/integration/customid/ent/note_query.go @@ -338,7 +338,6 @@ func (nq *NoteQuery) WithChildren(opts ...func(*NoteQuery)) *NoteQuery { // GroupBy(note.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NoteQuery) GroupBy(field string, fields ...string) *NoteGroupBy { grbuild := &NoteGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (nq *NoteQuery) GroupBy(field string, fields ...string) *NoteGroupBy { // client.Note.Query(). // Select(note.FieldText). // Scan(ctx, &v) -// func (nq *NoteQuery) Select(fields ...string) *NoteSelect { nq.fields = append(nq.fields, fields...) selbuild := &NoteSelect{NoteQuery: nq} diff --git a/entc/integration/customid/ent/other_create.go b/entc/integration/customid/ent/other_create.go index 4dca1a7d74..bc444bbeec 100644 --- a/entc/integration/customid/ent/other_create.go +++ b/entc/integration/customid/ent/other_create.go @@ -176,7 +176,6 @@ func (oc *OtherCreate) createSpec() (*Other, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (oc *OtherCreate) OnConflict(opts ...sql.ConflictOption) *OtherUpsertOne { oc.conflict = opts return &OtherUpsertOne{ @@ -190,7 +189,6 @@ func (oc *OtherCreate) OnConflict(opts ...sql.ConflictOption) *OtherUpsertOne { // client.Other.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (oc *OtherCreate) OnConflictColumns(columns ...string) *OtherUpsertOne { oc.conflict = append(oc.conflict, sql.ConflictColumns(columns...)) return &OtherUpsertOne{ @@ -222,7 +220,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *OtherUpsertOne) UpdateNewValues() *OtherUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -236,10 +233,9 @@ func (u *OtherUpsertOne) UpdateNewValues() *OtherUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Other.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Other.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *OtherUpsertOne) Ignore() *OtherUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -391,7 +387,6 @@ func (ocb *OtherCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (ocb *OtherCreateBulk) OnConflict(opts ...sql.ConflictOption) *OtherUpsertBulk { ocb.conflict = opts return &OtherUpsertBulk{ @@ -405,7 +400,6 @@ func (ocb *OtherCreateBulk) OnConflict(opts ...sql.ConflictOption) *OtherUpsertB // client.Other.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ocb *OtherCreateBulk) OnConflictColumns(columns ...string) *OtherUpsertBulk { ocb.conflict = append(ocb.conflict, sql.ConflictColumns(columns...)) return &OtherUpsertBulk{ @@ -430,7 +424,6 @@ type OtherUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *OtherUpsertBulk) UpdateNewValues() *OtherUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -450,7 +443,6 @@ func (u *OtherUpsertBulk) UpdateNewValues() *OtherUpsertBulk { // client.Other.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *OtherUpsertBulk) Ignore() *OtherUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/pet_create.go b/entc/integration/customid/ent/pet_create.go index 6c97167cb0..b963d3bd02 100644 --- a/entc/integration/customid/ent/pet_create.go +++ b/entc/integration/customid/ent/pet_create.go @@ -328,7 +328,6 @@ func (pc *PetCreate) createSpec() (*Pet, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (pc *PetCreate) OnConflict(opts ...sql.ConflictOption) *PetUpsertOne { pc.conflict = opts return &PetUpsertOne{ @@ -342,7 +341,6 @@ func (pc *PetCreate) OnConflict(opts ...sql.ConflictOption) *PetUpsertOne { // client.Pet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (pc *PetCreate) OnConflictColumns(columns ...string) *PetUpsertOne { pc.conflict = append(pc.conflict, sql.ConflictColumns(columns...)) return &PetUpsertOne{ @@ -374,7 +372,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *PetUpsertOne) UpdateNewValues() *PetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -388,10 +385,9 @@ func (u *PetUpsertOne) UpdateNewValues() *PetUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Pet.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Pet.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *PetUpsertOne) Ignore() *PetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -543,7 +539,6 @@ func (pcb *PetCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (pcb *PetCreateBulk) OnConflict(opts ...sql.ConflictOption) *PetUpsertBulk { pcb.conflict = opts return &PetUpsertBulk{ @@ -557,7 +552,6 @@ func (pcb *PetCreateBulk) OnConflict(opts ...sql.ConflictOption) *PetUpsertBulk // client.Pet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (pcb *PetCreateBulk) OnConflictColumns(columns ...string) *PetUpsertBulk { pcb.conflict = append(pcb.conflict, sql.ConflictColumns(columns...)) return &PetUpsertBulk{ @@ -582,7 +576,6 @@ type PetUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *PetUpsertBulk) UpdateNewValues() *PetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -602,7 +595,6 @@ func (u *PetUpsertBulk) UpdateNewValues() *PetUpsertBulk { // client.Pet.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *PetUpsertBulk) Ignore() *PetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/revision_create.go b/entc/integration/customid/ent/revision_create.go index 65cc4e37e2..8ee8b12480 100644 --- a/entc/integration/customid/ent/revision_create.go +++ b/entc/integration/customid/ent/revision_create.go @@ -158,7 +158,6 @@ func (rc *RevisionCreate) createSpec() (*Revision, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (rc *RevisionCreate) OnConflict(opts ...sql.ConflictOption) *RevisionUpsertOne { rc.conflict = opts return &RevisionUpsertOne{ @@ -172,7 +171,6 @@ func (rc *RevisionCreate) OnConflict(opts ...sql.ConflictOption) *RevisionUpsert // client.Revision.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rc *RevisionCreate) OnConflictColumns(columns ...string) *RevisionUpsertOne { rc.conflict = append(rc.conflict, sql.ConflictColumns(columns...)) return &RevisionUpsertOne{ @@ -204,7 +202,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *RevisionUpsertOne) UpdateNewValues() *RevisionUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -218,10 +215,9 @@ func (u *RevisionUpsertOne) UpdateNewValues() *RevisionUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Revision.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Revision.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *RevisionUpsertOne) Ignore() *RevisionUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -372,7 +368,6 @@ func (rcb *RevisionCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (rcb *RevisionCreateBulk) OnConflict(opts ...sql.ConflictOption) *RevisionUpsertBulk { rcb.conflict = opts return &RevisionUpsertBulk{ @@ -386,7 +381,6 @@ func (rcb *RevisionCreateBulk) OnConflict(opts ...sql.ConflictOption) *RevisionU // client.Revision.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rcb *RevisionCreateBulk) OnConflictColumns(columns ...string) *RevisionUpsertBulk { rcb.conflict = append(rcb.conflict, sql.ConflictColumns(columns...)) return &RevisionUpsertBulk{ @@ -411,7 +405,6 @@ type RevisionUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *RevisionUpsertBulk) UpdateNewValues() *RevisionUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -431,7 +424,6 @@ func (u *RevisionUpsertBulk) UpdateNewValues() *RevisionUpsertBulk { // client.Revision.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *RevisionUpsertBulk) Ignore() *RevisionUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/session_create.go b/entc/integration/customid/ent/session_create.go index b276e12a47..a40424a6a4 100644 --- a/entc/integration/customid/ent/session_create.go +++ b/entc/integration/customid/ent/session_create.go @@ -221,7 +221,6 @@ func (sc *SessionCreate) createSpec() (*Session, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (sc *SessionCreate) OnConflict(opts ...sql.ConflictOption) *SessionUpsertOne { sc.conflict = opts return &SessionUpsertOne{ @@ -235,7 +234,6 @@ func (sc *SessionCreate) OnConflict(opts ...sql.ConflictOption) *SessionUpsertOn // client.Session.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (sc *SessionCreate) OnConflictColumns(columns ...string) *SessionUpsertOne { sc.conflict = append(sc.conflict, sql.ConflictColumns(columns...)) return &SessionUpsertOne{ @@ -267,7 +265,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *SessionUpsertOne) UpdateNewValues() *SessionUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -281,10 +278,9 @@ func (u *SessionUpsertOne) UpdateNewValues() *SessionUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Session.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Session.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *SessionUpsertOne) Ignore() *SessionUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -436,7 +432,6 @@ func (scb *SessionCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (scb *SessionCreateBulk) OnConflict(opts ...sql.ConflictOption) *SessionUpsertBulk { scb.conflict = opts return &SessionUpsertBulk{ @@ -450,7 +445,6 @@ func (scb *SessionCreateBulk) OnConflict(opts ...sql.ConflictOption) *SessionUps // client.Session.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (scb *SessionCreateBulk) OnConflictColumns(columns ...string) *SessionUpsertBulk { scb.conflict = append(scb.conflict, sql.ConflictColumns(columns...)) return &SessionUpsertBulk{ @@ -475,7 +469,6 @@ type SessionUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *SessionUpsertBulk) UpdateNewValues() *SessionUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -495,7 +488,6 @@ func (u *SessionUpsertBulk) UpdateNewValues() *SessionUpsertBulk { // client.Session.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *SessionUpsertBulk) Ignore() *SessionUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/token_create.go b/entc/integration/customid/ent/token_create.go index 2fc2b14b46..bd80d0ceef 100644 --- a/entc/integration/customid/ent/token_create.go +++ b/entc/integration/customid/ent/token_create.go @@ -239,7 +239,6 @@ func (tc *TokenCreate) createSpec() (*Token, *sqlgraph.CreateSpec) { // SetBody(v+v). // }). // Exec(ctx) -// func (tc *TokenCreate) OnConflict(opts ...sql.ConflictOption) *TokenUpsertOne { tc.conflict = opts return &TokenUpsertOne{ @@ -253,7 +252,6 @@ func (tc *TokenCreate) OnConflict(opts ...sql.ConflictOption) *TokenUpsertOne { // client.Token.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tc *TokenCreate) OnConflictColumns(columns ...string) *TokenUpsertOne { tc.conflict = append(tc.conflict, sql.ConflictColumns(columns...)) return &TokenUpsertOne{ @@ -297,7 +295,6 @@ func (u *TokenUpsert) UpdateBody() *TokenUpsert { // }), // ). // Exec(ctx) -// func (u *TokenUpsertOne) UpdateNewValues() *TokenUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -311,10 +308,9 @@ func (u *TokenUpsertOne) UpdateNewValues() *TokenUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Token.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Token.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TokenUpsertOne) Ignore() *TokenUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -485,7 +481,6 @@ func (tcb *TokenCreateBulk) ExecX(ctx context.Context) { // SetBody(v+v). // }). // Exec(ctx) -// func (tcb *TokenCreateBulk) OnConflict(opts ...sql.ConflictOption) *TokenUpsertBulk { tcb.conflict = opts return &TokenUpsertBulk{ @@ -499,7 +494,6 @@ func (tcb *TokenCreateBulk) OnConflict(opts ...sql.ConflictOption) *TokenUpsertB // client.Token.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tcb *TokenCreateBulk) OnConflictColumns(columns ...string) *TokenUpsertBulk { tcb.conflict = append(tcb.conflict, sql.ConflictColumns(columns...)) return &TokenUpsertBulk{ @@ -524,7 +518,6 @@ type TokenUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *TokenUpsertBulk) UpdateNewValues() *TokenUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -544,7 +537,6 @@ func (u *TokenUpsertBulk) UpdateNewValues() *TokenUpsertBulk { // client.Token.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TokenUpsertBulk) Ignore() *TokenUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/customid/ent/token_query.go b/entc/integration/customid/ent/token_query.go index 134af82910..48043bc2b9 100644 --- a/entc/integration/customid/ent/token_query.go +++ b/entc/integration/customid/ent/token_query.go @@ -303,7 +303,6 @@ func (tq *TokenQuery) WithAccount(opts ...func(*AccountQuery)) *TokenQuery { // GroupBy(token.FieldBody). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TokenQuery) GroupBy(field string, fields ...string) *TokenGroupBy { grbuild := &TokenGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -330,7 +329,6 @@ func (tq *TokenQuery) GroupBy(field string, fields ...string) *TokenGroupBy { // client.Token.Query(). // Select(token.FieldBody). // Scan(ctx, &v) -// func (tq *TokenQuery) Select(fields ...string) *TokenSelect { tq.fields = append(tq.fields, fields...) selbuild := &TokenSelect{TokenQuery: tq} diff --git a/entc/integration/customid/ent/user_create.go b/entc/integration/customid/ent/user_create.go index 2d04143f1f..3b73413361 100644 --- a/entc/integration/customid/ent/user_create.go +++ b/entc/integration/customid/ent/user_create.go @@ -297,7 +297,6 @@ func (uc *UserCreate) createSpec() (*User, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { uc.conflict = opts return &UserUpsertOne{ @@ -311,7 +310,6 @@ func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (uc *UserCreate) OnConflictColumns(columns ...string) *UserUpsertOne { uc.conflict = append(uc.conflict, sql.ConflictColumns(columns...)) return &UserUpsertOne{ @@ -343,7 +341,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -357,10 +354,9 @@ func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.User.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.User.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *UserUpsertOne) Ignore() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -510,7 +506,6 @@ func (ucb *UserCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBulk { ucb.conflict = opts return &UserUpsertBulk{ @@ -524,7 +519,6 @@ func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBul // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflictColumns(columns ...string) *UserUpsertBulk { ucb.conflict = append(ucb.conflict, sql.ConflictColumns(columns...)) return &UserUpsertBulk{ @@ -549,7 +543,6 @@ type UserUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -569,7 +562,6 @@ func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { // client.User.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *UserUpsertBulk) Ignore() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgefield/ent/car_query.go b/entc/integration/edgefield/ent/car_query.go index 3eeb7d4397..21e3b6567a 100644 --- a/entc/integration/edgefield/ent/car_query.go +++ b/entc/integration/edgefield/ent/car_query.go @@ -303,7 +303,6 @@ func (cq *CarQuery) WithRentals(opts ...func(*RentalQuery)) *CarQuery { // GroupBy(car.FieldNumber). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { grbuild := &CarGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -330,7 +329,6 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { // client.Car.Query(). // Select(car.FieldNumber). // Scan(ctx, &v) -// func (cq *CarQuery) Select(fields ...string) *CarSelect { cq.fields = append(cq.fields, fields...) selbuild := &CarSelect{CarQuery: cq} diff --git a/entc/integration/edgefield/ent/card_query.go b/entc/integration/edgefield/ent/card_query.go index 1d3135bb75..e2055ee793 100644 --- a/entc/integration/edgefield/ent/card_query.go +++ b/entc/integration/edgefield/ent/card_query.go @@ -301,7 +301,6 @@ func (cq *CardQuery) WithOwner(opts ...func(*UserQuery)) *CardQuery { // GroupBy(card.FieldNumber). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { grbuild := &CardGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { // client.Card.Query(). // Select(card.FieldNumber). // Scan(ctx, &v) -// func (cq *CardQuery) Select(fields ...string) *CardSelect { cq.fields = append(cq.fields, fields...) selbuild := &CardSelect{CardQuery: cq} diff --git a/entc/integration/edgefield/ent/client.go b/entc/integration/edgefield/ent/client.go index e456f2e101..8555b637c4 100644 --- a/entc/integration/edgefield/ent/client.go +++ b/entc/integration/edgefield/ent/client.go @@ -154,7 +154,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Car. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/edgefield/ent/ent.go b/entc/integration/edgefield/ent/ent.go index 80e84fb5c0..cdc03a3020 100644 --- a/entc/integration/edgefield/ent/ent.go +++ b/entc/integration/edgefield/ent/ent.go @@ -101,7 +101,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/edgefield/ent/hook/hook.go b/entc/integration/edgefield/ent/hook/hook.go index 31e7757b0f..476ac6975b 100644 --- a/entc/integration/edgefield/ent/hook/hook.go +++ b/entc/integration/edgefield/ent/hook/hook.go @@ -225,7 +225,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -240,7 +239,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -248,7 +246,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -269,7 +266,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/edgefield/ent/info_query.go b/entc/integration/edgefield/ent/info_query.go index 87ff8fd16c..66909d9ad7 100644 --- a/entc/integration/edgefield/ent/info_query.go +++ b/entc/integration/edgefield/ent/info_query.go @@ -301,7 +301,6 @@ func (iq *InfoQuery) WithUser(opts ...func(*UserQuery)) *InfoQuery { // GroupBy(info.FieldContent). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (iq *InfoQuery) GroupBy(field string, fields ...string) *InfoGroupBy { grbuild := &InfoGroupBy{config: iq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (iq *InfoQuery) GroupBy(field string, fields ...string) *InfoGroupBy { // client.Info.Query(). // Select(info.FieldContent). // Scan(ctx, &v) -// func (iq *InfoQuery) Select(fields ...string) *InfoSelect { iq.fields = append(iq.fields, fields...) selbuild := &InfoSelect{InfoQuery: iq} diff --git a/entc/integration/edgefield/ent/metadata_query.go b/entc/integration/edgefield/ent/metadata_query.go index 2c4d3f8396..d0f52ca36f 100644 --- a/entc/integration/edgefield/ent/metadata_query.go +++ b/entc/integration/edgefield/ent/metadata_query.go @@ -372,7 +372,6 @@ func (mq *MetadataQuery) WithParent(opts ...func(*MetadataQuery)) *MetadataQuery // GroupBy(metadata.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (mq *MetadataQuery) GroupBy(field string, fields ...string) *MetadataGroupBy { grbuild := &MetadataGroupBy{config: mq.config} grbuild.fields = append([]string{field}, fields...) @@ -399,7 +398,6 @@ func (mq *MetadataQuery) GroupBy(field string, fields ...string) *MetadataGroupB // client.Metadata.Query(). // Select(metadata.FieldAge). // Scan(ctx, &v) -// func (mq *MetadataQuery) Select(fields ...string) *MetadataSelect { mq.fields = append(mq.fields, fields...) selbuild := &MetadataSelect{MetadataQuery: mq} diff --git a/entc/integration/edgefield/ent/migrate/migrate.go b/entc/integration/edgefield/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/edgefield/ent/migrate/migrate.go +++ b/entc/integration/edgefield/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/edgefield/ent/node_query.go b/entc/integration/edgefield/ent/node_query.go index f0667eec2d..199e4d04ec 100644 --- a/entc/integration/edgefield/ent/node_query.go +++ b/entc/integration/edgefield/ent/node_query.go @@ -336,7 +336,6 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { // GroupBy(node.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { grbuild := &NodeGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -363,7 +362,6 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { // client.Node.Query(). // Select(node.FieldValue). // Scan(ctx, &v) -// func (nq *NodeQuery) Select(fields ...string) *NodeSelect { nq.fields = append(nq.fields, fields...) selbuild := &NodeSelect{NodeQuery: nq} diff --git a/entc/integration/edgefield/ent/pet_query.go b/entc/integration/edgefield/ent/pet_query.go index 7e0192c950..13075ddea2 100644 --- a/entc/integration/edgefield/ent/pet_query.go +++ b/entc/integration/edgefield/ent/pet_query.go @@ -301,7 +301,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldOwnerID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldOwnerID). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/edgefield/ent/post_query.go b/entc/integration/edgefield/ent/post_query.go index cb198b7879..1776acf4b9 100644 --- a/entc/integration/edgefield/ent/post_query.go +++ b/entc/integration/edgefield/ent/post_query.go @@ -301,7 +301,6 @@ func (pq *PostQuery) WithAuthor(opts ...func(*UserQuery)) *PostQuery { // GroupBy(post.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PostQuery) GroupBy(field string, fields ...string) *PostGroupBy { grbuild := &PostGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (pq *PostQuery) GroupBy(field string, fields ...string) *PostGroupBy { // client.Post.Query(). // Select(post.FieldText). // Scan(ctx, &v) -// func (pq *PostQuery) Select(fields ...string) *PostSelect { pq.fields = append(pq.fields, fields...) selbuild := &PostSelect{PostQuery: pq} diff --git a/entc/integration/edgefield/ent/rental_query.go b/entc/integration/edgefield/ent/rental_query.go index 6776b3cea7..b9ccfbad5e 100644 --- a/entc/integration/edgefield/ent/rental_query.go +++ b/entc/integration/edgefield/ent/rental_query.go @@ -338,7 +338,6 @@ func (rq *RentalQuery) WithCar(opts ...func(*CarQuery)) *RentalQuery { // GroupBy(rental.FieldDate). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (rq *RentalQuery) GroupBy(field string, fields ...string) *RentalGroupBy { grbuild := &RentalGroupBy{config: rq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (rq *RentalQuery) GroupBy(field string, fields ...string) *RentalGroupBy { // client.Rental.Query(). // Select(rental.FieldDate). // Scan(ctx, &v) -// func (rq *RentalQuery) Select(fields ...string) *RentalSelect { rq.fields = append(rq.fields, fields...) selbuild := &RentalSelect{RentalQuery: rq} diff --git a/entc/integration/edgefield/ent/user_query.go b/entc/integration/edgefield/ent/user_query.go index 6949784d65..492529c848 100644 --- a/entc/integration/edgefield/ent/user_query.go +++ b/entc/integration/edgefield/ent/user_query.go @@ -551,7 +551,6 @@ func (uq *UserQuery) WithRentals(opts ...func(*RentalQuery)) *UserQuery { // GroupBy(user.FieldParentID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -578,7 +577,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldParentID). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/edgeschema/ent/client.go b/entc/integration/edgeschema/ent/client.go index 16527b8df2..09d4ae4c08 100644 --- a/entc/integration/edgeschema/ent/client.go +++ b/entc/integration/edgeschema/ent/client.go @@ -178,7 +178,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Friendship. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/edgeschema/ent/ent.go b/entc/integration/edgeschema/ent/ent.go index acd3ad53d7..78ec0935ab 100644 --- a/entc/integration/edgeschema/ent/ent.go +++ b/entc/integration/edgeschema/ent/ent.go @@ -109,7 +109,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/edgeschema/ent/friendship_create.go b/entc/integration/edgeschema/ent/friendship_create.go index dd1c2a4672..680972f41f 100644 --- a/entc/integration/edgeschema/ent/friendship_create.go +++ b/entc/integration/edgeschema/ent/friendship_create.go @@ -287,7 +287,6 @@ func (fc *FriendshipCreate) createSpec() (*Friendship, *sqlgraph.CreateSpec) { // SetWeight(v+v). // }). // Exec(ctx) -// func (fc *FriendshipCreate) OnConflict(opts ...sql.ConflictOption) *FriendshipUpsertOne { fc.conflict = opts return &FriendshipUpsertOne{ @@ -301,7 +300,6 @@ func (fc *FriendshipCreate) OnConflict(opts ...sql.ConflictOption) *FriendshipUp // client.Friendship.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (fc *FriendshipCreate) OnConflictColumns(columns ...string) *FriendshipUpsertOne { fc.conflict = append(fc.conflict, sql.ConflictColumns(columns...)) return &FriendshipUpsertOne{ @@ -384,7 +382,6 @@ func (u *FriendshipUpsert) UpdateFriendID() *FriendshipUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FriendshipUpsertOne) UpdateNewValues() *FriendshipUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -393,10 +390,9 @@ func (u *FriendshipUpsertOne) UpdateNewValues() *FriendshipUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Friendship.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Friendship.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *FriendshipUpsertOne) Ignore() *FriendshipUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -615,7 +611,6 @@ func (fcb *FriendshipCreateBulk) ExecX(ctx context.Context) { // SetWeight(v+v). // }). // Exec(ctx) -// func (fcb *FriendshipCreateBulk) OnConflict(opts ...sql.ConflictOption) *FriendshipUpsertBulk { fcb.conflict = opts return &FriendshipUpsertBulk{ @@ -629,7 +624,6 @@ func (fcb *FriendshipCreateBulk) OnConflict(opts ...sql.ConflictOption) *Friends // client.Friendship.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (fcb *FriendshipCreateBulk) OnConflictColumns(columns ...string) *FriendshipUpsertBulk { fcb.conflict = append(fcb.conflict, sql.ConflictColumns(columns...)) return &FriendshipUpsertBulk{ @@ -651,7 +645,6 @@ type FriendshipUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FriendshipUpsertBulk) UpdateNewValues() *FriendshipUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -663,7 +656,6 @@ func (u *FriendshipUpsertBulk) UpdateNewValues() *FriendshipUpsertBulk { // client.Friendship.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *FriendshipUpsertBulk) Ignore() *FriendshipUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/friendship_query.go b/entc/integration/edgeschema/ent/friendship_query.go index 9314fe3560..b0d6ee39d6 100644 --- a/entc/integration/edgeschema/ent/friendship_query.go +++ b/entc/integration/edgeschema/ent/friendship_query.go @@ -336,7 +336,6 @@ func (fq *FriendshipQuery) WithFriend(opts ...func(*UserQuery)) *FriendshipQuery // GroupBy(friendship.FieldWeight). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (fq *FriendshipQuery) GroupBy(field string, fields ...string) *FriendshipGroupBy { grbuild := &FriendshipGroupBy{config: fq.config} grbuild.fields = append([]string{field}, fields...) @@ -363,7 +362,6 @@ func (fq *FriendshipQuery) GroupBy(field string, fields ...string) *FriendshipGr // client.Friendship.Query(). // Select(friendship.FieldWeight). // Scan(ctx, &v) -// func (fq *FriendshipQuery) Select(fields ...string) *FriendshipSelect { fq.fields = append(fq.fields, fields...) selbuild := &FriendshipSelect{FriendshipQuery: fq} diff --git a/entc/integration/edgeschema/ent/group_create.go b/entc/integration/edgeschema/ent/group_create.go index adf2d7091a..85549a5f41 100644 --- a/entc/integration/edgeschema/ent/group_create.go +++ b/entc/integration/edgeschema/ent/group_create.go @@ -256,7 +256,6 @@ func (gc *GroupCreate) createSpec() (*Group, *sqlgraph.CreateSpec) { // SetName(v+v). // }). // Exec(ctx) -// func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { gc.conflict = opts return &GroupUpsertOne{ @@ -270,7 +269,6 @@ func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gc *GroupCreate) OnConflictColumns(columns ...string) *GroupUpsertOne { gc.conflict = append(gc.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertOne{ @@ -311,7 +309,6 @@ func (u *GroupUpsert) UpdateName() *GroupUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -320,10 +317,9 @@ func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Group.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Group.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *GroupUpsertOne) Ignore() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -493,7 +489,6 @@ func (gcb *GroupCreateBulk) ExecX(ctx context.Context) { // SetName(v+v). // }). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertBulk { gcb.conflict = opts return &GroupUpsertBulk{ @@ -507,7 +502,6 @@ func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertB // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflictColumns(columns ...string) *GroupUpsertBulk { gcb.conflict = append(gcb.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertBulk{ @@ -529,7 +523,6 @@ type GroupUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -541,7 +534,6 @@ func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { // client.Group.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *GroupUpsertBulk) Ignore() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/group_query.go b/entc/integration/edgeschema/ent/group_query.go index 61ba4c6688..580cdc002f 100644 --- a/entc/integration/edgeschema/ent/group_query.go +++ b/entc/integration/edgeschema/ent/group_query.go @@ -338,7 +338,6 @@ func (gq *GroupQuery) WithJoinedUsers(opts ...func(*UserGroupQuery)) *GroupQuery // GroupBy(group.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/edgeschema/ent/hook/hook.go b/entc/integration/edgeschema/ent/hook/hook.go index 0c8513f9c4..a8760fb7b7 100644 --- a/entc/integration/edgeschema/ent/hook/hook.go +++ b/entc/integration/edgeschema/ent/hook/hook.go @@ -277,7 +277,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -292,7 +291,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -300,7 +298,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -321,7 +318,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/edgeschema/ent/migrate/migrate.go b/entc/integration/edgeschema/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/edgeschema/ent/migrate/migrate.go +++ b/entc/integration/edgeschema/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/edgeschema/ent/relationship_create.go b/entc/integration/edgeschema/ent/relationship_create.go index 79a157096f..9271c7355d 100644 --- a/entc/integration/edgeschema/ent/relationship_create.go +++ b/entc/integration/edgeschema/ent/relationship_create.go @@ -289,7 +289,6 @@ func (rc *RelationshipCreate) createSpec() (*Relationship, *sqlgraph.CreateSpec) // SetWeight(v+v). // }). // Exec(ctx) -// func (rc *RelationshipCreate) OnConflict(opts ...sql.ConflictOption) *RelationshipUpsertOne { rc.conflict = opts return &RelationshipUpsertOne{ @@ -303,7 +302,6 @@ func (rc *RelationshipCreate) OnConflict(opts ...sql.ConflictOption) *Relationsh // client.Relationship.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rc *RelationshipCreate) OnConflictColumns(columns ...string) *RelationshipUpsertOne { rc.conflict = append(rc.conflict, sql.ConflictColumns(columns...)) return &RelationshipUpsertOne{ @@ -392,7 +390,6 @@ func (u *RelationshipUpsert) ClearInfoID() *RelationshipUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RelationshipUpsertOne) UpdateNewValues() *RelationshipUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -401,10 +398,9 @@ func (u *RelationshipUpsertOne) UpdateNewValues() *RelationshipUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Relationship.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Relationship.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *RelationshipUpsertOne) Ignore() *RelationshipUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -607,7 +603,6 @@ func (rcb *RelationshipCreateBulk) ExecX(ctx context.Context) { // SetWeight(v+v). // }). // Exec(ctx) -// func (rcb *RelationshipCreateBulk) OnConflict(opts ...sql.ConflictOption) *RelationshipUpsertBulk { rcb.conflict = opts return &RelationshipUpsertBulk{ @@ -621,7 +616,6 @@ func (rcb *RelationshipCreateBulk) OnConflict(opts ...sql.ConflictOption) *Relat // client.Relationship.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rcb *RelationshipCreateBulk) OnConflictColumns(columns ...string) *RelationshipUpsertBulk { rcb.conflict = append(rcb.conflict, sql.ConflictColumns(columns...)) return &RelationshipUpsertBulk{ @@ -643,7 +637,6 @@ type RelationshipUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RelationshipUpsertBulk) UpdateNewValues() *RelationshipUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -655,7 +648,6 @@ func (u *RelationshipUpsertBulk) UpdateNewValues() *RelationshipUpsertBulk { // client.Relationship.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *RelationshipUpsertBulk) Ignore() *RelationshipUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/relationship_query.go b/entc/integration/edgeschema/ent/relationship_query.go index 66bf9cad88..d768d0d794 100644 --- a/entc/integration/edgeschema/ent/relationship_query.go +++ b/entc/integration/edgeschema/ent/relationship_query.go @@ -302,7 +302,6 @@ func (rq *RelationshipQuery) WithInfo(opts ...func(*RelationshipInfoQuery)) *Rel // GroupBy(relationship.FieldWeight). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (rq *RelationshipQuery) GroupBy(field string, fields ...string) *RelationshipGroupBy { grbuild := &RelationshipGroupBy{config: rq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (rq *RelationshipQuery) GroupBy(field string, fields ...string) *Relationsh // client.Relationship.Query(). // Select(relationship.FieldWeight). // Scan(ctx, &v) -// func (rq *RelationshipQuery) Select(fields ...string) *RelationshipSelect { rq.fields = append(rq.fields, fields...) selbuild := &RelationshipSelect{RelationshipQuery: rq} diff --git a/entc/integration/edgeschema/ent/relationshipinfo_create.go b/entc/integration/edgeschema/ent/relationshipinfo_create.go index f406601087..9d5817a739 100644 --- a/entc/integration/edgeschema/ent/relationshipinfo_create.go +++ b/entc/integration/edgeschema/ent/relationshipinfo_create.go @@ -165,7 +165,6 @@ func (ric *RelationshipInfoCreate) createSpec() (*RelationshipInfo, *sqlgraph.Cr // SetText(v+v). // }). // Exec(ctx) -// func (ric *RelationshipInfoCreate) OnConflict(opts ...sql.ConflictOption) *RelationshipInfoUpsertOne { ric.conflict = opts return &RelationshipInfoUpsertOne{ @@ -179,7 +178,6 @@ func (ric *RelationshipInfoCreate) OnConflict(opts ...sql.ConflictOption) *Relat // client.RelationshipInfo.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ric *RelationshipInfoCreate) OnConflictColumns(columns ...string) *RelationshipInfoUpsertOne { ric.conflict = append(ric.conflict, sql.ConflictColumns(columns...)) return &RelationshipInfoUpsertOne{ @@ -220,7 +218,6 @@ func (u *RelationshipInfoUpsert) UpdateText() *RelationshipInfoUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RelationshipInfoUpsertOne) UpdateNewValues() *RelationshipInfoUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -229,10 +226,9 @@ func (u *RelationshipInfoUpsertOne) UpdateNewValues() *RelationshipInfoUpsertOne // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.RelationshipInfo.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.RelationshipInfo.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *RelationshipInfoUpsertOne) Ignore() *RelationshipInfoUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -401,7 +397,6 @@ func (ricb *RelationshipInfoCreateBulk) ExecX(ctx context.Context) { // SetText(v+v). // }). // Exec(ctx) -// func (ricb *RelationshipInfoCreateBulk) OnConflict(opts ...sql.ConflictOption) *RelationshipInfoUpsertBulk { ricb.conflict = opts return &RelationshipInfoUpsertBulk{ @@ -415,7 +410,6 @@ func (ricb *RelationshipInfoCreateBulk) OnConflict(opts ...sql.ConflictOption) * // client.RelationshipInfo.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ricb *RelationshipInfoCreateBulk) OnConflictColumns(columns ...string) *RelationshipInfoUpsertBulk { ricb.conflict = append(ricb.conflict, sql.ConflictColumns(columns...)) return &RelationshipInfoUpsertBulk{ @@ -437,7 +431,6 @@ type RelationshipInfoUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RelationshipInfoUpsertBulk) UpdateNewValues() *RelationshipInfoUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -449,7 +442,6 @@ func (u *RelationshipInfoUpsertBulk) UpdateNewValues() *RelationshipInfoUpsertBu // client.RelationshipInfo.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *RelationshipInfoUpsertBulk) Ignore() *RelationshipInfoUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/relationshipinfo_query.go b/entc/integration/edgeschema/ent/relationshipinfo_query.go index 36f81c1db6..85e6640629 100644 --- a/entc/integration/edgeschema/ent/relationshipinfo_query.go +++ b/entc/integration/edgeschema/ent/relationshipinfo_query.go @@ -265,7 +265,6 @@ func (riq *RelationshipInfoQuery) Clone() *RelationshipInfoQuery { // GroupBy(relationshipinfo.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (riq *RelationshipInfoQuery) GroupBy(field string, fields ...string) *RelationshipInfoGroupBy { grbuild := &RelationshipInfoGroupBy{config: riq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (riq *RelationshipInfoQuery) GroupBy(field string, fields ...string) *Relat // client.RelationshipInfo.Query(). // Select(relationshipinfo.FieldText). // Scan(ctx, &v) -// func (riq *RelationshipInfoQuery) Select(fields ...string) *RelationshipInfoSelect { riq.fields = append(riq.fields, fields...) selbuild := &RelationshipInfoSelect{RelationshipInfoQuery: riq} diff --git a/entc/integration/edgeschema/ent/role_create.go b/entc/integration/edgeschema/ent/role_create.go index 8797f86a85..43be72a874 100644 --- a/entc/integration/edgeschema/ent/role_create.go +++ b/entc/integration/edgeschema/ent/role_create.go @@ -239,7 +239,6 @@ func (rc *RoleCreate) createSpec() (*Role, *sqlgraph.CreateSpec) { // SetName(v+v). // }). // Exec(ctx) -// func (rc *RoleCreate) OnConflict(opts ...sql.ConflictOption) *RoleUpsertOne { rc.conflict = opts return &RoleUpsertOne{ @@ -253,7 +252,6 @@ func (rc *RoleCreate) OnConflict(opts ...sql.ConflictOption) *RoleUpsertOne { // client.Role.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rc *RoleCreate) OnConflictColumns(columns ...string) *RoleUpsertOne { rc.conflict = append(rc.conflict, sql.ConflictColumns(columns...)) return &RoleUpsertOne{ @@ -306,7 +304,6 @@ func (u *RoleUpsert) UpdateCreatedAt() *RoleUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RoleUpsertOne) UpdateNewValues() *RoleUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -315,10 +312,9 @@ func (u *RoleUpsertOne) UpdateNewValues() *RoleUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Role.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Role.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *RoleUpsertOne) Ignore() *RoleUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -502,7 +498,6 @@ func (rcb *RoleCreateBulk) ExecX(ctx context.Context) { // SetName(v+v). // }). // Exec(ctx) -// func (rcb *RoleCreateBulk) OnConflict(opts ...sql.ConflictOption) *RoleUpsertBulk { rcb.conflict = opts return &RoleUpsertBulk{ @@ -516,7 +511,6 @@ func (rcb *RoleCreateBulk) OnConflict(opts ...sql.ConflictOption) *RoleUpsertBul // client.Role.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rcb *RoleCreateBulk) OnConflictColumns(columns ...string) *RoleUpsertBulk { rcb.conflict = append(rcb.conflict, sql.ConflictColumns(columns...)) return &RoleUpsertBulk{ @@ -538,7 +532,6 @@ type RoleUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RoleUpsertBulk) UpdateNewValues() *RoleUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -550,7 +543,6 @@ func (u *RoleUpsertBulk) UpdateNewValues() *RoleUpsertBulk { // client.Role.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *RoleUpsertBulk) Ignore() *RoleUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/role_query.go b/entc/integration/edgeschema/ent/role_query.go index 49924a937a..7c32aaf7ba 100644 --- a/entc/integration/edgeschema/ent/role_query.go +++ b/entc/integration/edgeschema/ent/role_query.go @@ -338,7 +338,6 @@ func (rq *RoleQuery) WithRolesUsers(opts ...func(*RoleUserQuery)) *RoleQuery { // GroupBy(role.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (rq *RoleQuery) GroupBy(field string, fields ...string) *RoleGroupBy { grbuild := &RoleGroupBy{config: rq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (rq *RoleQuery) GroupBy(field string, fields ...string) *RoleGroupBy { // client.Role.Query(). // Select(role.FieldName). // Scan(ctx, &v) -// func (rq *RoleQuery) Select(fields ...string) *RoleSelect { rq.fields = append(rq.fields, fields...) selbuild := &RoleSelect{RoleQuery: rq} diff --git a/entc/integration/edgeschema/ent/roleuser_create.go b/entc/integration/edgeschema/ent/roleuser_create.go index 8f99ee7e41..3721df578d 100644 --- a/entc/integration/edgeschema/ent/roleuser_create.go +++ b/entc/integration/edgeschema/ent/roleuser_create.go @@ -251,7 +251,6 @@ func (ruc *RoleUserCreate) createSpec() (*RoleUser, *sqlgraph.CreateSpec) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (ruc *RoleUserCreate) OnConflict(opts ...sql.ConflictOption) *RoleUserUpsertOne { ruc.conflict = opts return &RoleUserUpsertOne{ @@ -265,7 +264,6 @@ func (ruc *RoleUserCreate) OnConflict(opts ...sql.ConflictOption) *RoleUserUpser // client.RoleUser.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ruc *RoleUserCreate) OnConflictColumns(columns ...string) *RoleUserUpsertOne { ruc.conflict = append(ruc.conflict, sql.ConflictColumns(columns...)) return &RoleUserUpsertOne{ @@ -330,7 +328,6 @@ func (u *RoleUserUpsert) UpdateUserID() *RoleUserUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RoleUserUpsertOne) UpdateNewValues() *RoleUserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -339,10 +336,9 @@ func (u *RoleUserUpsertOne) UpdateNewValues() *RoleUserUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.RoleUser.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.RoleUser.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *RoleUserUpsertOne) Ignore() *RoleUserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -517,7 +513,6 @@ func (rucb *RoleUserCreateBulk) ExecX(ctx context.Context) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (rucb *RoleUserCreateBulk) OnConflict(opts ...sql.ConflictOption) *RoleUserUpsertBulk { rucb.conflict = opts return &RoleUserUpsertBulk{ @@ -531,7 +526,6 @@ func (rucb *RoleUserCreateBulk) OnConflict(opts ...sql.ConflictOption) *RoleUser // client.RoleUser.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (rucb *RoleUserCreateBulk) OnConflictColumns(columns ...string) *RoleUserUpsertBulk { rucb.conflict = append(rucb.conflict, sql.ConflictColumns(columns...)) return &RoleUserUpsertBulk{ @@ -553,7 +547,6 @@ type RoleUserUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *RoleUserUpsertBulk) UpdateNewValues() *RoleUserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -565,7 +558,6 @@ func (u *RoleUserUpsertBulk) UpdateNewValues() *RoleUserUpsertBulk { // client.RoleUser.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *RoleUserUpsertBulk) Ignore() *RoleUserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/roleuser_query.go b/entc/integration/edgeschema/ent/roleuser_query.go index 9364abe9e3..997d484f13 100644 --- a/entc/integration/edgeschema/ent/roleuser_query.go +++ b/entc/integration/edgeschema/ent/roleuser_query.go @@ -267,7 +267,6 @@ func (ruq *RoleUserQuery) WithUser(opts ...func(*UserQuery)) *RoleUserQuery { // GroupBy(roleuser.FieldCreatedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ruq *RoleUserQuery) GroupBy(field string, fields ...string) *RoleUserGroupBy { grbuild := &RoleUserGroupBy{config: ruq.config} grbuild.fields = append([]string{field}, fields...) @@ -294,7 +293,6 @@ func (ruq *RoleUserQuery) GroupBy(field string, fields ...string) *RoleUserGroup // client.RoleUser.Query(). // Select(roleuser.FieldCreatedAt). // Scan(ctx, &v) -// func (ruq *RoleUserQuery) Select(fields ...string) *RoleUserSelect { ruq.fields = append(ruq.fields, fields...) selbuild := &RoleUserSelect{RoleUserQuery: ruq} diff --git a/entc/integration/edgeschema/ent/tag_create.go b/entc/integration/edgeschema/ent/tag_create.go index c4e4c7c0af..5758f11167 100644 --- a/entc/integration/edgeschema/ent/tag_create.go +++ b/entc/integration/edgeschema/ent/tag_create.go @@ -243,7 +243,6 @@ func (tc *TagCreate) createSpec() (*Tag, *sqlgraph.CreateSpec) { // SetValue(v+v). // }). // Exec(ctx) -// func (tc *TagCreate) OnConflict(opts ...sql.ConflictOption) *TagUpsertOne { tc.conflict = opts return &TagUpsertOne{ @@ -257,7 +256,6 @@ func (tc *TagCreate) OnConflict(opts ...sql.ConflictOption) *TagUpsertOne { // client.Tag.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tc *TagCreate) OnConflictColumns(columns ...string) *TagUpsertOne { tc.conflict = append(tc.conflict, sql.ConflictColumns(columns...)) return &TagUpsertOne{ @@ -298,7 +296,6 @@ func (u *TagUpsert) UpdateValue() *TagUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TagUpsertOne) UpdateNewValues() *TagUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -307,10 +304,9 @@ func (u *TagUpsertOne) UpdateNewValues() *TagUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Tag.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Tag.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TagUpsertOne) Ignore() *TagUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -479,7 +475,6 @@ func (tcb *TagCreateBulk) ExecX(ctx context.Context) { // SetValue(v+v). // }). // Exec(ctx) -// func (tcb *TagCreateBulk) OnConflict(opts ...sql.ConflictOption) *TagUpsertBulk { tcb.conflict = opts return &TagUpsertBulk{ @@ -493,7 +488,6 @@ func (tcb *TagCreateBulk) OnConflict(opts ...sql.ConflictOption) *TagUpsertBulk // client.Tag.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tcb *TagCreateBulk) OnConflictColumns(columns ...string) *TagUpsertBulk { tcb.conflict = append(tcb.conflict, sql.ConflictColumns(columns...)) return &TagUpsertBulk{ @@ -515,7 +509,6 @@ type TagUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TagUpsertBulk) UpdateNewValues() *TagUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -527,7 +520,6 @@ func (u *TagUpsertBulk) UpdateNewValues() *TagUpsertBulk { // client.Tag.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TagUpsertBulk) Ignore() *TagUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/tag_query.go b/entc/integration/edgeschema/ent/tag_query.go index fd25e38973..e6cf20d914 100644 --- a/entc/integration/edgeschema/ent/tag_query.go +++ b/entc/integration/edgeschema/ent/tag_query.go @@ -338,7 +338,6 @@ func (tq *TagQuery) WithTweetTags(opts ...func(*TweetTagQuery)) *TagQuery { // GroupBy(tag.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TagQuery) GroupBy(field string, fields ...string) *TagGroupBy { grbuild := &TagGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (tq *TagQuery) GroupBy(field string, fields ...string) *TagGroupBy { // client.Tag.Query(). // Select(tag.FieldValue). // Scan(ctx, &v) -// func (tq *TagQuery) Select(fields ...string) *TagSelect { tq.fields = append(tq.fields, fields...) selbuild := &TagSelect{TagQuery: tq} diff --git a/entc/integration/edgeschema/ent/tweet_create.go b/entc/integration/edgeschema/ent/tweet_create.go index 172405ad00..2c12076c8c 100644 --- a/entc/integration/edgeschema/ent/tweet_create.go +++ b/entc/integration/edgeschema/ent/tweet_create.go @@ -355,7 +355,6 @@ func (tc *TweetCreate) createSpec() (*Tweet, *sqlgraph.CreateSpec) { // SetText(v+v). // }). // Exec(ctx) -// func (tc *TweetCreate) OnConflict(opts ...sql.ConflictOption) *TweetUpsertOne { tc.conflict = opts return &TweetUpsertOne{ @@ -369,7 +368,6 @@ func (tc *TweetCreate) OnConflict(opts ...sql.ConflictOption) *TweetUpsertOne { // client.Tweet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tc *TweetCreate) OnConflictColumns(columns ...string) *TweetUpsertOne { tc.conflict = append(tc.conflict, sql.ConflictColumns(columns...)) return &TweetUpsertOne{ @@ -410,7 +408,6 @@ func (u *TweetUpsert) UpdateText() *TweetUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TweetUpsertOne) UpdateNewValues() *TweetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -419,10 +416,9 @@ func (u *TweetUpsertOne) UpdateNewValues() *TweetUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Tweet.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Tweet.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TweetUpsertOne) Ignore() *TweetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -591,7 +587,6 @@ func (tcb *TweetCreateBulk) ExecX(ctx context.Context) { // SetText(v+v). // }). // Exec(ctx) -// func (tcb *TweetCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetUpsertBulk { tcb.conflict = opts return &TweetUpsertBulk{ @@ -605,7 +600,6 @@ func (tcb *TweetCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetUpsertB // client.Tweet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tcb *TweetCreateBulk) OnConflictColumns(columns ...string) *TweetUpsertBulk { tcb.conflict = append(tcb.conflict, sql.ConflictColumns(columns...)) return &TweetUpsertBulk{ @@ -627,7 +621,6 @@ type TweetUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TweetUpsertBulk) UpdateNewValues() *TweetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -639,7 +632,6 @@ func (u *TweetUpsertBulk) UpdateNewValues() *TweetUpsertBulk { // client.Tweet.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TweetUpsertBulk) Ignore() *TweetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/tweet_query.go b/entc/integration/edgeschema/ent/tweet_query.go index 04b698b763..450b412848 100644 --- a/entc/integration/edgeschema/ent/tweet_query.go +++ b/entc/integration/edgeschema/ent/tweet_query.go @@ -481,7 +481,6 @@ func (tq *TweetQuery) WithTweetTags(opts ...func(*TweetTagQuery)) *TweetQuery { // GroupBy(tweet.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TweetQuery) GroupBy(field string, fields ...string) *TweetGroupBy { grbuild := &TweetGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -508,7 +507,6 @@ func (tq *TweetQuery) GroupBy(field string, fields ...string) *TweetGroupBy { // client.Tweet.Query(). // Select(tweet.FieldText). // Scan(ctx, &v) -// func (tq *TweetQuery) Select(fields ...string) *TweetSelect { tq.fields = append(tq.fields, fields...) selbuild := &TweetSelect{TweetQuery: tq} diff --git a/entc/integration/edgeschema/ent/tweetlike/tweetlike.go b/entc/integration/edgeschema/ent/tweetlike/tweetlike.go index b1d1317eef..f5f9c1f729 100644 --- a/entc/integration/edgeschema/ent/tweetlike/tweetlike.go +++ b/entc/integration/edgeschema/ent/tweetlike/tweetlike.go @@ -69,7 +69,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/edgeschema/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/entc/integration/edgeschema/ent/tweetlike_create.go b/entc/integration/edgeschema/ent/tweetlike_create.go index 854d993771..bee8f53400 100644 --- a/entc/integration/edgeschema/ent/tweetlike_create.go +++ b/entc/integration/edgeschema/ent/tweetlike_create.go @@ -257,7 +257,6 @@ func (tlc *TweetLikeCreate) createSpec() (*TweetLike, *sqlgraph.CreateSpec) { // SetLikedAt(v+v). // }). // Exec(ctx) -// func (tlc *TweetLikeCreate) OnConflict(opts ...sql.ConflictOption) *TweetLikeUpsertOne { tlc.conflict = opts return &TweetLikeUpsertOne{ @@ -271,7 +270,6 @@ func (tlc *TweetLikeCreate) OnConflict(opts ...sql.ConflictOption) *TweetLikeUps // client.TweetLike.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tlc *TweetLikeCreate) OnConflictColumns(columns ...string) *TweetLikeUpsertOne { tlc.conflict = append(tlc.conflict, sql.ConflictColumns(columns...)) return &TweetLikeUpsertOne{ @@ -336,7 +334,6 @@ func (u *TweetLikeUpsert) UpdateTweetID() *TweetLikeUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TweetLikeUpsertOne) UpdateNewValues() *TweetLikeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -345,10 +342,9 @@ func (u *TweetLikeUpsertOne) UpdateNewValues() *TweetLikeUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.TweetLike.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.TweetLike.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TweetLikeUpsertOne) Ignore() *TweetLikeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -523,7 +519,6 @@ func (tlcb *TweetLikeCreateBulk) ExecX(ctx context.Context) { // SetLikedAt(v+v). // }). // Exec(ctx) -// func (tlcb *TweetLikeCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetLikeUpsertBulk { tlcb.conflict = opts return &TweetLikeUpsertBulk{ @@ -537,7 +532,6 @@ func (tlcb *TweetLikeCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetLi // client.TweetLike.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tlcb *TweetLikeCreateBulk) OnConflictColumns(columns ...string) *TweetLikeUpsertBulk { tlcb.conflict = append(tlcb.conflict, sql.ConflictColumns(columns...)) return &TweetLikeUpsertBulk{ @@ -559,7 +553,6 @@ type TweetLikeUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TweetLikeUpsertBulk) UpdateNewValues() *TweetLikeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -571,7 +564,6 @@ func (u *TweetLikeUpsertBulk) UpdateNewValues() *TweetLikeUpsertBulk { // client.TweetLike.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TweetLikeUpsertBulk) Ignore() *TweetLikeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/tweetlike_query.go b/entc/integration/edgeschema/ent/tweetlike_query.go index 761d709692..a8152d6082 100644 --- a/entc/integration/edgeschema/ent/tweetlike_query.go +++ b/entc/integration/edgeschema/ent/tweetlike_query.go @@ -268,7 +268,6 @@ func (tlq *TweetLikeQuery) WithUser(opts ...func(*UserQuery)) *TweetLikeQuery { // GroupBy(tweetlike.FieldLikedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tlq *TweetLikeQuery) GroupBy(field string, fields ...string) *TweetLikeGroupBy { grbuild := &TweetLikeGroupBy{config: tlq.config} grbuild.fields = append([]string{field}, fields...) @@ -295,7 +294,6 @@ func (tlq *TweetLikeQuery) GroupBy(field string, fields ...string) *TweetLikeGro // client.TweetLike.Query(). // Select(tweetlike.FieldLikedAt). // Scan(ctx, &v) -// func (tlq *TweetLikeQuery) Select(fields ...string) *TweetLikeSelect { tlq.fields = append(tlq.fields, fields...) selbuild := &TweetLikeSelect{TweetLikeQuery: tlq} diff --git a/entc/integration/edgeschema/ent/tweettag_create.go b/entc/integration/edgeschema/ent/tweettag_create.go index 67bdd790f5..470a7d68ce 100644 --- a/entc/integration/edgeschema/ent/tweettag_create.go +++ b/entc/integration/edgeschema/ent/tweettag_create.go @@ -288,7 +288,6 @@ func (ttc *TweetTagCreate) createSpec() (*TweetTag, *sqlgraph.CreateSpec) { // SetAddedAt(v+v). // }). // Exec(ctx) -// func (ttc *TweetTagCreate) OnConflict(opts ...sql.ConflictOption) *TweetTagUpsertOne { ttc.conflict = opts return &TweetTagUpsertOne{ @@ -302,7 +301,6 @@ func (ttc *TweetTagCreate) OnConflict(opts ...sql.ConflictOption) *TweetTagUpser // client.TweetTag.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ttc *TweetTagCreate) OnConflictColumns(columns ...string) *TweetTagUpsertOne { ttc.conflict = append(ttc.conflict, sql.ConflictColumns(columns...)) return &TweetTagUpsertOne{ @@ -370,7 +368,6 @@ func (u *TweetTagUpsert) UpdateTweetID() *TweetTagUpsert { // }), // ). // Exec(ctx) -// func (u *TweetTagUpsertOne) UpdateNewValues() *TweetTagUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -384,10 +381,9 @@ func (u *TweetTagUpsertOne) UpdateNewValues() *TweetTagUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.TweetTag.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.TweetTag.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TweetTagUpsertOne) Ignore() *TweetTagUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -586,7 +582,6 @@ func (ttcb *TweetTagCreateBulk) ExecX(ctx context.Context) { // SetAddedAt(v+v). // }). // Exec(ctx) -// func (ttcb *TweetTagCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetTagUpsertBulk { ttcb.conflict = opts return &TweetTagUpsertBulk{ @@ -600,7 +595,6 @@ func (ttcb *TweetTagCreateBulk) OnConflict(opts ...sql.ConflictOption) *TweetTag // client.TweetTag.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ttcb *TweetTagCreateBulk) OnConflictColumns(columns ...string) *TweetTagUpsertBulk { ttcb.conflict = append(ttcb.conflict, sql.ConflictColumns(columns...)) return &TweetTagUpsertBulk{ @@ -625,7 +619,6 @@ type TweetTagUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *TweetTagUpsertBulk) UpdateNewValues() *TweetTagUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -645,7 +638,6 @@ func (u *TweetTagUpsertBulk) UpdateNewValues() *TweetTagUpsertBulk { // client.TweetTag.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TweetTagUpsertBulk) Ignore() *TweetTagUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/tweettag_query.go b/entc/integration/edgeschema/ent/tweettag_query.go index 10860c72f3..762060cb76 100644 --- a/entc/integration/edgeschema/ent/tweettag_query.go +++ b/entc/integration/edgeschema/ent/tweettag_query.go @@ -338,7 +338,6 @@ func (ttq *TweetTagQuery) WithTweet(opts ...func(*TweetQuery)) *TweetTagQuery { // GroupBy(tweettag.FieldAddedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ttq *TweetTagQuery) GroupBy(field string, fields ...string) *TweetTagGroupBy { grbuild := &TweetTagGroupBy{config: ttq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (ttq *TweetTagQuery) GroupBy(field string, fields ...string) *TweetTagGroup // client.TweetTag.Query(). // Select(tweettag.FieldAddedAt). // Scan(ctx, &v) -// func (ttq *TweetTagQuery) Select(fields ...string) *TweetTagSelect { ttq.fields = append(ttq.fields, fields...) selbuild := &TweetTagSelect{TweetTagQuery: ttq} diff --git a/entc/integration/edgeschema/ent/user/user.go b/entc/integration/edgeschema/ent/user/user.go index 0fb26cd5c3..21427438aa 100644 --- a/entc/integration/edgeschema/ent/user/user.go +++ b/entc/integration/edgeschema/ent/user/user.go @@ -153,7 +153,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/edgeschema/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/entc/integration/edgeschema/ent/user_create.go b/entc/integration/edgeschema/ent/user_create.go index 30a89cae59..1ecf54c796 100644 --- a/entc/integration/edgeschema/ent/user_create.go +++ b/entc/integration/edgeschema/ent/user_create.go @@ -521,7 +521,6 @@ func (uc *UserCreate) createSpec() (*User, *sqlgraph.CreateSpec) { // SetName(v+v). // }). // Exec(ctx) -// func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { uc.conflict = opts return &UserUpsertOne{ @@ -535,7 +534,6 @@ func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (uc *UserCreate) OnConflictColumns(columns ...string) *UserUpsertOne { uc.conflict = append(uc.conflict, sql.ConflictColumns(columns...)) return &UserUpsertOne{ @@ -576,7 +574,6 @@ func (u *UserUpsert) UpdateName() *UserUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -585,10 +582,9 @@ func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.User.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.User.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *UserUpsertOne) Ignore() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -758,7 +754,6 @@ func (ucb *UserCreateBulk) ExecX(ctx context.Context) { // SetName(v+v). // }). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBulk { ucb.conflict = opts return &UserUpsertBulk{ @@ -772,7 +767,6 @@ func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBul // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflictColumns(columns ...string) *UserUpsertBulk { ucb.conflict = append(ucb.conflict, sql.ConflictColumns(columns...)) return &UserUpsertBulk{ @@ -794,7 +788,6 @@ type UserUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -806,7 +799,6 @@ func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { // client.User.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *UserUpsertBulk) Ignore() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/user_query.go b/entc/integration/edgeschema/ent/user_query.go index 833ea9c41f..2bb190bde5 100644 --- a/entc/integration/edgeschema/ent/user_query.go +++ b/entc/integration/edgeschema/ent/user_query.go @@ -696,7 +696,6 @@ func (uq *UserQuery) WithRolesUsers(opts ...func(*RoleUserQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -723,7 +722,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/edgeschema/ent/usergroup_create.go b/entc/integration/edgeschema/ent/usergroup_create.go index 31d418b92d..30c7b32fca 100644 --- a/entc/integration/edgeschema/ent/usergroup_create.go +++ b/entc/integration/edgeschema/ent/usergroup_create.go @@ -259,7 +259,6 @@ func (ugc *UserGroupCreate) createSpec() (*UserGroup, *sqlgraph.CreateSpec) { // SetJoinedAt(v+v). // }). // Exec(ctx) -// func (ugc *UserGroupCreate) OnConflict(opts ...sql.ConflictOption) *UserGroupUpsertOne { ugc.conflict = opts return &UserGroupUpsertOne{ @@ -273,7 +272,6 @@ func (ugc *UserGroupCreate) OnConflict(opts ...sql.ConflictOption) *UserGroupUps // client.UserGroup.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ugc *UserGroupCreate) OnConflictColumns(columns ...string) *UserGroupUpsertOne { ugc.conflict = append(ugc.conflict, sql.ConflictColumns(columns...)) return &UserGroupUpsertOne{ @@ -338,7 +336,6 @@ func (u *UserGroupUpsert) UpdateGroupID() *UserGroupUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserGroupUpsertOne) UpdateNewValues() *UserGroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -347,10 +344,9 @@ func (u *UserGroupUpsertOne) UpdateNewValues() *UserGroupUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.UserGroup.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.UserGroup.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *UserGroupUpsertOne) Ignore() *UserGroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -548,7 +544,6 @@ func (ugcb *UserGroupCreateBulk) ExecX(ctx context.Context) { // SetJoinedAt(v+v). // }). // Exec(ctx) -// func (ugcb *UserGroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserGroupUpsertBulk { ugcb.conflict = opts return &UserGroupUpsertBulk{ @@ -562,7 +557,6 @@ func (ugcb *UserGroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserGro // client.UserGroup.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ugcb *UserGroupCreateBulk) OnConflictColumns(columns ...string) *UserGroupUpsertBulk { ugcb.conflict = append(ugcb.conflict, sql.ConflictColumns(columns...)) return &UserGroupUpsertBulk{ @@ -584,7 +578,6 @@ type UserGroupUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserGroupUpsertBulk) UpdateNewValues() *UserGroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -596,7 +589,6 @@ func (u *UserGroupUpsertBulk) UpdateNewValues() *UserGroupUpsertBulk { // client.UserGroup.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *UserGroupUpsertBulk) Ignore() *UserGroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/usergroup_query.go b/entc/integration/edgeschema/ent/usergroup_query.go index 3faf078c0a..49e558ef9c 100644 --- a/entc/integration/edgeschema/ent/usergroup_query.go +++ b/entc/integration/edgeschema/ent/usergroup_query.go @@ -337,7 +337,6 @@ func (ugq *UserGroupQuery) WithGroup(opts ...func(*GroupQuery)) *UserGroupQuery // GroupBy(usergroup.FieldJoinedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ugq *UserGroupQuery) GroupBy(field string, fields ...string) *UserGroupGroupBy { grbuild := &UserGroupGroupBy{config: ugq.config} grbuild.fields = append([]string{field}, fields...) @@ -364,7 +363,6 @@ func (ugq *UserGroupQuery) GroupBy(field string, fields ...string) *UserGroupGro // client.UserGroup.Query(). // Select(usergroup.FieldJoinedAt). // Scan(ctx, &v) -// func (ugq *UserGroupQuery) Select(fields ...string) *UserGroupSelect { ugq.fields = append(ugq.fields, fields...) selbuild := &UserGroupSelect{UserGroupQuery: ugq} diff --git a/entc/integration/edgeschema/ent/usertweet_create.go b/entc/integration/edgeschema/ent/usertweet_create.go index 97093b6675..150c008a7d 100644 --- a/entc/integration/edgeschema/ent/usertweet_create.go +++ b/entc/integration/edgeschema/ent/usertweet_create.go @@ -259,7 +259,6 @@ func (utc *UserTweetCreate) createSpec() (*UserTweet, *sqlgraph.CreateSpec) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (utc *UserTweetCreate) OnConflict(opts ...sql.ConflictOption) *UserTweetUpsertOne { utc.conflict = opts return &UserTweetUpsertOne{ @@ -273,7 +272,6 @@ func (utc *UserTweetCreate) OnConflict(opts ...sql.ConflictOption) *UserTweetUps // client.UserTweet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (utc *UserTweetCreate) OnConflictColumns(columns ...string) *UserTweetUpsertOne { utc.conflict = append(utc.conflict, sql.ConflictColumns(columns...)) return &UserTweetUpsertOne{ @@ -338,7 +336,6 @@ func (u *UserTweetUpsert) UpdateTweetID() *UserTweetUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserTweetUpsertOne) UpdateNewValues() *UserTweetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -347,10 +344,9 @@ func (u *UserTweetUpsertOne) UpdateNewValues() *UserTweetUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.UserTweet.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.UserTweet.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *UserTweetUpsertOne) Ignore() *UserTweetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -548,7 +544,6 @@ func (utcb *UserTweetCreateBulk) ExecX(ctx context.Context) { // SetCreatedAt(v+v). // }). // Exec(ctx) -// func (utcb *UserTweetCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserTweetUpsertBulk { utcb.conflict = opts return &UserTweetUpsertBulk{ @@ -562,7 +557,6 @@ func (utcb *UserTweetCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserTwe // client.UserTweet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (utcb *UserTweetCreateBulk) OnConflictColumns(columns ...string) *UserTweetUpsertBulk { utcb.conflict = append(utcb.conflict, sql.ConflictColumns(columns...)) return &UserTweetUpsertBulk{ @@ -584,7 +578,6 @@ type UserTweetUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserTweetUpsertBulk) UpdateNewValues() *UserTweetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -596,7 +589,6 @@ func (u *UserTweetUpsertBulk) UpdateNewValues() *UserTweetUpsertBulk { // client.UserTweet.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *UserTweetUpsertBulk) Ignore() *UserTweetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/edgeschema/ent/usertweet_query.go b/entc/integration/edgeschema/ent/usertweet_query.go index 57f2d9278c..0c5c4fa4f2 100644 --- a/entc/integration/edgeschema/ent/usertweet_query.go +++ b/entc/integration/edgeschema/ent/usertweet_query.go @@ -337,7 +337,6 @@ func (utq *UserTweetQuery) WithTweet(opts ...func(*TweetQuery)) *UserTweetQuery // GroupBy(usertweet.FieldCreatedAt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (utq *UserTweetQuery) GroupBy(field string, fields ...string) *UserTweetGroupBy { grbuild := &UserTweetGroupBy{config: utq.config} grbuild.fields = append([]string{field}, fields...) @@ -364,7 +363,6 @@ func (utq *UserTweetQuery) GroupBy(field string, fields ...string) *UserTweetGro // client.UserTweet.Query(). // Select(usertweet.FieldCreatedAt). // Scan(ctx, &v) -// func (utq *UserTweetQuery) Select(fields ...string) *UserTweetSelect { utq.fields = append(utq.fields, fields...) selbuild := &UserTweetSelect{UserTweetQuery: utq} diff --git a/entc/integration/ent/card_create.go b/entc/integration/ent/card_create.go index d197833829..6e0abb3626 100644 --- a/entc/integration/ent/card_create.go +++ b/entc/integration/ent/card_create.go @@ -365,7 +365,6 @@ func (cc *CardCreate) createSpec() (*Card, *sqlgraph.CreateSpec) { // SetCreateTime(v+v). // }). // Exec(ctx) -// func (cc *CardCreate) OnConflict(opts ...sql.ConflictOption) *CardUpsertOne { cc.conflict = opts return &CardUpsertOne{ @@ -379,7 +378,6 @@ func (cc *CardCreate) OnConflict(opts ...sql.ConflictOption) *CardUpsertOne { // client.Card.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (cc *CardCreate) OnConflictColumns(columns ...string) *CardUpsertOne { cc.conflict = append(cc.conflict, sql.ConflictColumns(columns...)) return &CardUpsertOne{ @@ -480,7 +478,6 @@ func (u *CardUpsert) ClearName() *CardUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *CardUpsertOne) UpdateNewValues() *CardUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -497,10 +494,9 @@ func (u *CardUpsertOne) UpdateNewValues() *CardUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Card.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Card.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *CardUpsertOne) Ignore() *CardUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -740,7 +736,6 @@ func (ccb *CardCreateBulk) ExecX(ctx context.Context) { // SetCreateTime(v+v). // }). // Exec(ctx) -// func (ccb *CardCreateBulk) OnConflict(opts ...sql.ConflictOption) *CardUpsertBulk { ccb.conflict = opts return &CardUpsertBulk{ @@ -754,7 +749,6 @@ func (ccb *CardCreateBulk) OnConflict(opts ...sql.ConflictOption) *CardUpsertBul // client.Card.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ccb *CardCreateBulk) OnConflictColumns(columns ...string) *CardUpsertBulk { ccb.conflict = append(ccb.conflict, sql.ConflictColumns(columns...)) return &CardUpsertBulk{ @@ -776,7 +770,6 @@ type CardUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *CardUpsertBulk) UpdateNewValues() *CardUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -798,7 +791,6 @@ func (u *CardUpsertBulk) UpdateNewValues() *CardUpsertBulk { // client.Card.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *CardUpsertBulk) Ignore() *CardUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 7b84372dcc..504c8a701c 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -342,7 +342,6 @@ func (cq *CardQuery) WithSpec(opts ...func(*SpecQuery)) *CardQuery { // GroupBy(card.FieldCreateTime). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { grbuild := &CardGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -369,7 +368,6 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { // client.Card.Query(). // Select(card.FieldCreateTime). // Scan(ctx, &v) -// func (cq *CardQuery) Select(fields ...string) *CardSelect { cq.fields = append(cq.fields, fields...) selbuild := &CardSelect{CardQuery: cq} diff --git a/entc/integration/ent/client.go b/entc/integration/ent/client.go index 5962639bbb..a70372a406 100644 --- a/entc/integration/ent/client.go +++ b/entc/integration/ent/client.go @@ -190,7 +190,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Card. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/ent/comment_create.go b/entc/integration/ent/comment_create.go index 8f4ca5e6f8..b2ae35b70f 100644 --- a/entc/integration/ent/comment_create.go +++ b/entc/integration/ent/comment_create.go @@ -249,7 +249,6 @@ func (cc *CommentCreate) createSpec() (*Comment, *sqlgraph.CreateSpec) { // SetUniqueInt(v+v). // }). // Exec(ctx) -// func (cc *CommentCreate) OnConflict(opts ...sql.ConflictOption) *CommentUpsertOne { cc.conflict = opts return &CommentUpsertOne{ @@ -263,7 +262,6 @@ func (cc *CommentCreate) OnConflict(opts ...sql.ConflictOption) *CommentUpsertOn // client.Comment.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (cc *CommentCreate) OnConflictColumns(columns ...string) *CommentUpsertOne { cc.conflict = append(cc.conflict, sql.ConflictColumns(columns...)) return &CommentUpsertOne{ @@ -388,7 +386,6 @@ func (u *CommentUpsert) ClearDir() *CommentUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *CommentUpsertOne) UpdateNewValues() *CommentUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -397,10 +394,9 @@ func (u *CommentUpsertOne) UpdateNewValues() *CommentUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Comment.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Comment.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *CommentUpsertOne) Ignore() *CommentUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -667,7 +663,6 @@ func (ccb *CommentCreateBulk) ExecX(ctx context.Context) { // SetUniqueInt(v+v). // }). // Exec(ctx) -// func (ccb *CommentCreateBulk) OnConflict(opts ...sql.ConflictOption) *CommentUpsertBulk { ccb.conflict = opts return &CommentUpsertBulk{ @@ -681,7 +676,6 @@ func (ccb *CommentCreateBulk) OnConflict(opts ...sql.ConflictOption) *CommentUps // client.Comment.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ccb *CommentCreateBulk) OnConflictColumns(columns ...string) *CommentUpsertBulk { ccb.conflict = append(ccb.conflict, sql.ConflictColumns(columns...)) return &CommentUpsertBulk{ @@ -703,7 +697,6 @@ type CommentUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *CommentUpsertBulk) UpdateNewValues() *CommentUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -715,7 +708,6 @@ func (u *CommentUpsertBulk) UpdateNewValues() *CommentUpsertBulk { // client.Comment.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *CommentUpsertBulk) Ignore() *CommentUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index b2de420b1c..cbe5b505ce 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -267,7 +267,6 @@ func (cq *CommentQuery) Clone() *CommentQuery { // GroupBy(comment.FieldUniqueInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy { grbuild := &CommentGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -294,7 +293,6 @@ func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy // client.Comment.Query(). // Select(comment.FieldUniqueInt). // Scan(ctx, &v) -// func (cq *CommentQuery) Select(fields ...string) *CommentSelect { cq.fields = append(cq.fields, fields...) selbuild := &CommentSelect{CommentQuery: cq} diff --git a/entc/integration/ent/ent.go b/entc/integration/ent/ent.go index e85ca8e548..7a52375d9f 100644 --- a/entc/integration/ent/ent.go +++ b/entc/integration/ent/ent.go @@ -113,7 +113,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/ent/fieldtype_create.go b/entc/integration/ent/fieldtype_create.go index ea0f583054..3af2dedf1e 100644 --- a/entc/integration/ent/fieldtype_create.go +++ b/entc/integration/ent/fieldtype_create.go @@ -1556,7 +1556,6 @@ func (ftc *FieldTypeCreate) createSpec() (*FieldType, *sqlgraph.CreateSpec) { // SetInt(v+v). // }). // Exec(ctx) -// func (ftc *FieldTypeCreate) OnConflict(opts ...sql.ConflictOption) *FieldTypeUpsertOne { ftc.conflict = opts return &FieldTypeUpsertOne{ @@ -1570,7 +1569,6 @@ func (ftc *FieldTypeCreate) OnConflict(opts ...sql.ConflictOption) *FieldTypeUps // client.FieldType.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ftc *FieldTypeCreate) OnConflictColumns(columns ...string) *FieldTypeUpsertOne { ftc.conflict = append(ftc.conflict, sql.ConflictColumns(columns...)) return &FieldTypeUpsertOne{ @@ -2895,7 +2893,6 @@ func (u *FieldTypeUpsert) ClearPasswordOther() *FieldTypeUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FieldTypeUpsertOne) UpdateNewValues() *FieldTypeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -2904,10 +2901,9 @@ func (u *FieldTypeUpsertOne) UpdateNewValues() *FieldTypeUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.FieldType.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.FieldType.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *FieldTypeUpsertOne) Ignore() *FieldTypeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -4575,7 +4571,6 @@ func (ftcb *FieldTypeCreateBulk) ExecX(ctx context.Context) { // SetInt(v+v). // }). // Exec(ctx) -// func (ftcb *FieldTypeCreateBulk) OnConflict(opts ...sql.ConflictOption) *FieldTypeUpsertBulk { ftcb.conflict = opts return &FieldTypeUpsertBulk{ @@ -4589,7 +4584,6 @@ func (ftcb *FieldTypeCreateBulk) OnConflict(opts ...sql.ConflictOption) *FieldTy // client.FieldType.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ftcb *FieldTypeCreateBulk) OnConflictColumns(columns ...string) *FieldTypeUpsertBulk { ftcb.conflict = append(ftcb.conflict, sql.ConflictColumns(columns...)) return &FieldTypeUpsertBulk{ @@ -4611,7 +4605,6 @@ type FieldTypeUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FieldTypeUpsertBulk) UpdateNewValues() *FieldTypeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -4623,7 +4616,6 @@ func (u *FieldTypeUpsertBulk) UpdateNewValues() *FieldTypeUpsertBulk { // client.FieldType.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *FieldTypeUpsertBulk) Ignore() *FieldTypeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index ac4dd66add..1431830e59 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -268,7 +268,6 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { // GroupBy(fieldtype.FieldInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGroupBy { grbuild := &FieldTypeGroupBy{config: ftq.config} grbuild.fields = append([]string{field}, fields...) @@ -295,7 +294,6 @@ func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGro // client.FieldType.Query(). // Select(fieldtype.FieldInt). // Scan(ctx, &v) -// func (ftq *FieldTypeQuery) Select(fields ...string) *FieldTypeSelect { ftq.fields = append(ftq.fields, fields...) selbuild := &FieldTypeSelect{FieldTypeQuery: ftq} diff --git a/entc/integration/ent/file_create.go b/entc/integration/ent/file_create.go index 25be7092a2..f590aa2a45 100644 --- a/entc/integration/ent/file_create.go +++ b/entc/integration/ent/file_create.go @@ -407,7 +407,6 @@ func (fc *FileCreate) createSpec() (*File, *sqlgraph.CreateSpec) { // SetSize(v+v). // }). // Exec(ctx) -// func (fc *FileCreate) OnConflict(opts ...sql.ConflictOption) *FileUpsertOne { fc.conflict = opts return &FileUpsertOne{ @@ -421,7 +420,6 @@ func (fc *FileCreate) OnConflict(opts ...sql.ConflictOption) *FileUpsertOne { // client.File.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (fc *FileCreate) OnConflictColumns(columns ...string) *FileUpsertOne { fc.conflict = append(fc.conflict, sql.ConflictColumns(columns...)) return &FileUpsertOne{ @@ -558,7 +556,6 @@ func (u *FileUpsert) ClearFieldID() *FileUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FileUpsertOne) UpdateNewValues() *FileUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -567,10 +564,9 @@ func (u *FileUpsertOne) UpdateNewValues() *FileUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.File.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.File.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *FileUpsertOne) Ignore() *FileUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -852,7 +848,6 @@ func (fcb *FileCreateBulk) ExecX(ctx context.Context) { // SetSize(v+v). // }). // Exec(ctx) -// func (fcb *FileCreateBulk) OnConflict(opts ...sql.ConflictOption) *FileUpsertBulk { fcb.conflict = opts return &FileUpsertBulk{ @@ -866,7 +861,6 @@ func (fcb *FileCreateBulk) OnConflict(opts ...sql.ConflictOption) *FileUpsertBul // client.File.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (fcb *FileCreateBulk) OnConflictColumns(columns ...string) *FileUpsertBulk { fcb.conflict = append(fcb.conflict, sql.ConflictColumns(columns...)) return &FileUpsertBulk{ @@ -888,7 +882,6 @@ type FileUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FileUpsertBulk) UpdateNewValues() *FileUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -900,7 +893,6 @@ func (u *FileUpsertBulk) UpdateNewValues() *FileUpsertBulk { // client.File.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *FileUpsertBulk) Ignore() *FileUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index c89a1e34fe..81b8b075c0 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -378,7 +378,6 @@ func (fq *FileQuery) WithField(opts ...func(*FieldTypeQuery)) *FileQuery { // GroupBy(file.FieldSize). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { grbuild := &FileGroupBy{config: fq.config} grbuild.fields = append([]string{field}, fields...) @@ -405,7 +404,6 @@ func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { // client.File.Query(). // Select(file.FieldSize). // Scan(ctx, &v) -// func (fq *FileQuery) Select(fields ...string) *FileSelect { fq.fields = append(fq.fields, fields...) selbuild := &FileSelect{FileQuery: fq} diff --git a/entc/integration/ent/filetype_create.go b/entc/integration/ent/filetype_create.go index c2be8d598b..e9ea65e5ff 100644 --- a/entc/integration/ent/filetype_create.go +++ b/entc/integration/ent/filetype_create.go @@ -273,7 +273,6 @@ func (ftc *FileTypeCreate) createSpec() (*FileType, *sqlgraph.CreateSpec) { // SetName(v+v). // }). // Exec(ctx) -// func (ftc *FileTypeCreate) OnConflict(opts ...sql.ConflictOption) *FileTypeUpsertOne { ftc.conflict = opts return &FileTypeUpsertOne{ @@ -287,7 +286,6 @@ func (ftc *FileTypeCreate) OnConflict(opts ...sql.ConflictOption) *FileTypeUpser // client.FileType.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ftc *FileTypeCreate) OnConflictColumns(columns ...string) *FileTypeUpsertOne { ftc.conflict = append(ftc.conflict, sql.ConflictColumns(columns...)) return &FileTypeUpsertOne{ @@ -352,7 +350,6 @@ func (u *FileTypeUpsert) UpdateState() *FileTypeUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FileTypeUpsertOne) UpdateNewValues() *FileTypeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -361,10 +358,9 @@ func (u *FileTypeUpsertOne) UpdateNewValues() *FileTypeUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.FileType.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.FileType.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *FileTypeUpsertOne) Ignore() *FileTypeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -562,7 +558,6 @@ func (ftcb *FileTypeCreateBulk) ExecX(ctx context.Context) { // SetName(v+v). // }). // Exec(ctx) -// func (ftcb *FileTypeCreateBulk) OnConflict(opts ...sql.ConflictOption) *FileTypeUpsertBulk { ftcb.conflict = opts return &FileTypeUpsertBulk{ @@ -576,7 +571,6 @@ func (ftcb *FileTypeCreateBulk) OnConflict(opts ...sql.ConflictOption) *FileType // client.FileType.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ftcb *FileTypeCreateBulk) OnConflictColumns(columns ...string) *FileTypeUpsertBulk { ftcb.conflict = append(ftcb.conflict, sql.ConflictColumns(columns...)) return &FileTypeUpsertBulk{ @@ -598,7 +592,6 @@ type FileTypeUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *FileTypeUpsertBulk) UpdateNewValues() *FileTypeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -610,7 +603,6 @@ func (u *FileTypeUpsertBulk) UpdateNewValues() *FileTypeUpsertBulk { // client.FileType.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *FileTypeUpsertBulk) Ignore() *FileTypeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index bf32872149..4735b031ac 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -305,7 +305,6 @@ func (ftq *FileTypeQuery) WithFiles(opts ...func(*FileQuery)) *FileTypeQuery { // GroupBy(filetype.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroupBy { grbuild := &FileTypeGroupBy{config: ftq.config} grbuild.fields = append([]string{field}, fields...) @@ -332,7 +331,6 @@ func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroup // client.FileType.Query(). // Select(filetype.FieldName). // Scan(ctx, &v) -// func (ftq *FileTypeQuery) Select(fields ...string) *FileTypeSelect { ftq.fields = append(ftq.fields, fields...) selbuild := &FileTypeSelect{FileTypeQuery: ftq} diff --git a/entc/integration/ent/goods_create.go b/entc/integration/ent/goods_create.go index 66accc5b15..aa0a4acdc5 100644 --- a/entc/integration/ent/goods_create.go +++ b/entc/integration/ent/goods_create.go @@ -142,7 +142,6 @@ func (gc *GoodsCreate) createSpec() (*Goods, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (gc *GoodsCreate) OnConflict(opts ...sql.ConflictOption) *GoodsUpsertOne { gc.conflict = opts return &GoodsUpsertOne{ @@ -156,7 +155,6 @@ func (gc *GoodsCreate) OnConflict(opts ...sql.ConflictOption) *GoodsUpsertOne { // client.Goods.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gc *GoodsCreate) OnConflictColumns(columns ...string) *GoodsUpsertOne { gc.conflict = append(gc.conflict, sql.ConflictColumns(columns...)) return &GoodsUpsertOne{ @@ -185,7 +183,6 @@ type ( // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GoodsUpsertOne) UpdateNewValues() *GoodsUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -194,10 +191,9 @@ func (u *GoodsUpsertOne) UpdateNewValues() *GoodsUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Goods.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Goods.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *GoodsUpsertOne) Ignore() *GoodsUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -347,7 +343,6 @@ func (gcb *GoodsCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (gcb *GoodsCreateBulk) OnConflict(opts ...sql.ConflictOption) *GoodsUpsertBulk { gcb.conflict = opts return &GoodsUpsertBulk{ @@ -361,7 +356,6 @@ func (gcb *GoodsCreateBulk) OnConflict(opts ...sql.ConflictOption) *GoodsUpsertB // client.Goods.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gcb *GoodsCreateBulk) OnConflictColumns(columns ...string) *GoodsUpsertBulk { gcb.conflict = append(gcb.conflict, sql.ConflictColumns(columns...)) return &GoodsUpsertBulk{ @@ -383,7 +377,6 @@ type GoodsUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GoodsUpsertBulk) UpdateNewValues() *GoodsUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -395,7 +388,6 @@ func (u *GoodsUpsertBulk) UpdateNewValues() *GoodsUpsertBulk { // client.Goods.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *GoodsUpsertBulk) Ignore() *GoodsUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/group_create.go b/entc/integration/ent/group_create.go index 8e02bf1b48..e7f659485d 100644 --- a/entc/integration/ent/group_create.go +++ b/entc/integration/ent/group_create.go @@ -419,7 +419,6 @@ func (gc *GroupCreate) createSpec() (*Group, *sqlgraph.CreateSpec) { // SetActive(v+v). // }). // Exec(ctx) -// func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { gc.conflict = opts return &GroupUpsertOne{ @@ -433,7 +432,6 @@ func (gc *GroupCreate) OnConflict(opts ...sql.ConflictOption) *GroupUpsertOne { // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gc *GroupCreate) OnConflictColumns(columns ...string) *GroupUpsertOne { gc.conflict = append(gc.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertOne{ @@ -540,7 +538,6 @@ func (u *GroupUpsert) UpdateName() *GroupUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -549,10 +546,9 @@ func (u *GroupUpsertOne) UpdateNewValues() *GroupUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Group.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Group.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *GroupUpsertOne) Ignore() *GroupUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -799,7 +795,6 @@ func (gcb *GroupCreateBulk) ExecX(ctx context.Context) { // SetActive(v+v). // }). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertBulk { gcb.conflict = opts return &GroupUpsertBulk{ @@ -813,7 +808,6 @@ func (gcb *GroupCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupUpsertB // client.Group.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gcb *GroupCreateBulk) OnConflictColumns(columns ...string) *GroupUpsertBulk { gcb.conflict = append(gcb.conflict, sql.ConflictColumns(columns...)) return &GroupUpsertBulk{ @@ -835,7 +829,6 @@ type GroupUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -847,7 +840,6 @@ func (u *GroupUpsertBulk) UpdateNewValues() *GroupUpsertBulk { // client.Group.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *GroupUpsertBulk) Ignore() *GroupUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index a0c0caa8e1..80adf3aec4 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -415,7 +415,6 @@ func (gq *GroupQuery) WithInfo(opts ...func(*GroupInfoQuery)) *GroupQuery { // GroupBy(group.FieldActive). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -442,7 +441,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldActive). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/ent/groupinfo_create.go b/entc/integration/ent/groupinfo_create.go index 1b252fb4d8..bf4200a9c4 100644 --- a/entc/integration/ent/groupinfo_create.go +++ b/entc/integration/ent/groupinfo_create.go @@ -234,7 +234,6 @@ func (gic *GroupInfoCreate) createSpec() (*GroupInfo, *sqlgraph.CreateSpec) { // SetDesc(v+v). // }). // Exec(ctx) -// func (gic *GroupInfoCreate) OnConflict(opts ...sql.ConflictOption) *GroupInfoUpsertOne { gic.conflict = opts return &GroupInfoUpsertOne{ @@ -248,7 +247,6 @@ func (gic *GroupInfoCreate) OnConflict(opts ...sql.ConflictOption) *GroupInfoUps // client.GroupInfo.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gic *GroupInfoCreate) OnConflictColumns(columns ...string) *GroupInfoUpsertOne { gic.conflict = append(gic.conflict, sql.ConflictColumns(columns...)) return &GroupInfoUpsertOne{ @@ -307,7 +305,6 @@ func (u *GroupInfoUpsert) AddMaxUsers(v int) *GroupInfoUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupInfoUpsertOne) UpdateNewValues() *GroupInfoUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -316,10 +313,9 @@ func (u *GroupInfoUpsertOne) UpdateNewValues() *GroupInfoUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.GroupInfo.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.GroupInfo.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *GroupInfoUpsertOne) Ignore() *GroupInfoUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -510,7 +506,6 @@ func (gicb *GroupInfoCreateBulk) ExecX(ctx context.Context) { // SetDesc(v+v). // }). // Exec(ctx) -// func (gicb *GroupInfoCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupInfoUpsertBulk { gicb.conflict = opts return &GroupInfoUpsertBulk{ @@ -524,7 +519,6 @@ func (gicb *GroupInfoCreateBulk) OnConflict(opts ...sql.ConflictOption) *GroupIn // client.GroupInfo.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (gicb *GroupInfoCreateBulk) OnConflictColumns(columns ...string) *GroupInfoUpsertBulk { gicb.conflict = append(gicb.conflict, sql.ConflictColumns(columns...)) return &GroupInfoUpsertBulk{ @@ -546,7 +540,6 @@ type GroupInfoUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *GroupInfoUpsertBulk) UpdateNewValues() *GroupInfoUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -558,7 +551,6 @@ func (u *GroupInfoUpsertBulk) UpdateNewValues() *GroupInfoUpsertBulk { // client.GroupInfo.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *GroupInfoUpsertBulk) Ignore() *GroupInfoUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index b0afea9895..1ba7188bf1 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -305,7 +305,6 @@ func (giq *GroupInfoQuery) WithGroups(opts ...func(*GroupQuery)) *GroupInfoQuery // GroupBy(groupinfo.FieldDesc). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGroupBy { grbuild := &GroupInfoGroupBy{config: giq.config} grbuild.fields = append([]string{field}, fields...) @@ -332,7 +331,6 @@ func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGro // client.GroupInfo.Query(). // Select(groupinfo.FieldDesc). // Scan(ctx, &v) -// func (giq *GroupInfoQuery) Select(fields ...string) *GroupInfoSelect { giq.fields = append(giq.fields, fields...) selbuild := &GroupInfoSelect{GroupInfoQuery: giq} diff --git a/entc/integration/ent/hook/hook.go b/entc/integration/ent/hook/hook.go index c9cfeb93af..aa20889600 100644 --- a/entc/integration/ent/hook/hook.go +++ b/entc/integration/ent/hook/hook.go @@ -303,7 +303,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -318,7 +317,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -326,7 +324,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -347,7 +344,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/ent/item_create.go b/entc/integration/ent/item_create.go index 0fb1d56315..4e5de808de 100644 --- a/entc/integration/ent/item_create.go +++ b/entc/integration/ent/item_create.go @@ -213,7 +213,6 @@ func (ic *ItemCreate) createSpec() (*Item, *sqlgraph.CreateSpec) { // SetText(v+v). // }). // Exec(ctx) -// func (ic *ItemCreate) OnConflict(opts ...sql.ConflictOption) *ItemUpsertOne { ic.conflict = opts return &ItemUpsertOne{ @@ -227,7 +226,6 @@ func (ic *ItemCreate) OnConflict(opts ...sql.ConflictOption) *ItemUpsertOne { // client.Item.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ic *ItemCreate) OnConflictColumns(columns ...string) *ItemUpsertOne { ic.conflict = append(ic.conflict, sql.ConflictColumns(columns...)) return &ItemUpsertOne{ @@ -277,7 +275,6 @@ func (u *ItemUpsert) ClearText() *ItemUpsert { // }), // ). // Exec(ctx) -// func (u *ItemUpsertOne) UpdateNewValues() *ItemUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -291,10 +288,9 @@ func (u *ItemUpsertOne) UpdateNewValues() *ItemUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Item.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Item.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *ItemUpsertOne) Ignore() *ItemUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -472,7 +468,6 @@ func (icb *ItemCreateBulk) ExecX(ctx context.Context) { // SetText(v+v). // }). // Exec(ctx) -// func (icb *ItemCreateBulk) OnConflict(opts ...sql.ConflictOption) *ItemUpsertBulk { icb.conflict = opts return &ItemUpsertBulk{ @@ -486,7 +481,6 @@ func (icb *ItemCreateBulk) OnConflict(opts ...sql.ConflictOption) *ItemUpsertBul // client.Item.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (icb *ItemCreateBulk) OnConflictColumns(columns ...string) *ItemUpsertBulk { icb.conflict = append(icb.conflict, sql.ConflictColumns(columns...)) return &ItemUpsertBulk{ @@ -511,7 +505,6 @@ type ItemUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *ItemUpsertBulk) UpdateNewValues() *ItemUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -531,7 +524,6 @@ func (u *ItemUpsertBulk) UpdateNewValues() *ItemUpsertBulk { // client.Item.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *ItemUpsertBulk) Ignore() *ItemUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 88236d9521..8ffc1bad69 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -267,7 +267,6 @@ func (iq *ItemQuery) Clone() *ItemQuery { // GroupBy(item.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { grbuild := &ItemGroupBy{config: iq.config} grbuild.fields = append([]string{field}, fields...) @@ -294,7 +293,6 @@ func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { // client.Item.Query(). // Select(item.FieldText). // Scan(ctx, &v) -// func (iq *ItemQuery) Select(fields ...string) *ItemSelect { iq.fields = append(iq.fields, fields...) selbuild := &ItemSelect{ItemQuery: iq} diff --git a/entc/integration/ent/license_create.go b/entc/integration/ent/license_create.go index a7243851e7..34aa5fc715 100644 --- a/entc/integration/ent/license_create.go +++ b/entc/integration/ent/license_create.go @@ -154,7 +154,6 @@ func (lc *LicenseCreate) createSpec() (*License, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (lc *LicenseCreate) OnConflict(opts ...sql.ConflictOption) *LicenseUpsertOne { lc.conflict = opts return &LicenseUpsertOne{ @@ -168,7 +167,6 @@ func (lc *LicenseCreate) OnConflict(opts ...sql.ConflictOption) *LicenseUpsertOn // client.License.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (lc *LicenseCreate) OnConflictColumns(columns ...string) *LicenseUpsertOne { lc.conflict = append(lc.conflict, sql.ConflictColumns(columns...)) return &LicenseUpsertOne{ @@ -200,7 +198,6 @@ type ( // }), // ). // Exec(ctx) -// func (u *LicenseUpsertOne) UpdateNewValues() *LicenseUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -214,10 +211,9 @@ func (u *LicenseUpsertOne) UpdateNewValues() *LicenseUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.License.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.License.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *LicenseUpsertOne) Ignore() *LicenseUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -367,7 +363,6 @@ func (lcb *LicenseCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (lcb *LicenseCreateBulk) OnConflict(opts ...sql.ConflictOption) *LicenseUpsertBulk { lcb.conflict = opts return &LicenseUpsertBulk{ @@ -381,7 +376,6 @@ func (lcb *LicenseCreateBulk) OnConflict(opts ...sql.ConflictOption) *LicenseUps // client.License.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (lcb *LicenseCreateBulk) OnConflictColumns(columns ...string) *LicenseUpsertBulk { lcb.conflict = append(lcb.conflict, sql.ConflictColumns(columns...)) return &LicenseUpsertBulk{ @@ -406,7 +400,6 @@ type LicenseUpsertBulk struct { // }), // ). // Exec(ctx) -// func (u *LicenseUpsertBulk) UpdateNewValues() *LicenseUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { @@ -426,7 +419,6 @@ func (u *LicenseUpsertBulk) UpdateNewValues() *LicenseUpsertBulk { // client.License.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *LicenseUpsertBulk) Ignore() *LicenseUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/migrate/migrate.go b/entc/integration/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/ent/migrate/migrate.go +++ b/entc/integration/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/ent/node_create.go b/entc/integration/ent/node_create.go index a98f8e58f8..5365302732 100644 --- a/entc/integration/ent/node_create.go +++ b/entc/integration/ent/node_create.go @@ -247,7 +247,6 @@ func (nc *NodeCreate) createSpec() (*Node, *sqlgraph.CreateSpec) { // SetValue(v+v). // }). // Exec(ctx) -// func (nc *NodeCreate) OnConflict(opts ...sql.ConflictOption) *NodeUpsertOne { nc.conflict = opts return &NodeUpsertOne{ @@ -261,7 +260,6 @@ func (nc *NodeCreate) OnConflict(opts ...sql.ConflictOption) *NodeUpsertOne { // client.Node.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (nc *NodeCreate) OnConflictColumns(columns ...string) *NodeUpsertOne { nc.conflict = append(nc.conflict, sql.ConflictColumns(columns...)) return &NodeUpsertOne{ @@ -314,7 +312,6 @@ func (u *NodeUpsert) ClearValue() *NodeUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *NodeUpsertOne) UpdateNewValues() *NodeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -323,10 +320,9 @@ func (u *NodeUpsertOne) UpdateNewValues() *NodeUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Node.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Node.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *NodeUpsertOne) Ignore() *NodeUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -509,7 +505,6 @@ func (ncb *NodeCreateBulk) ExecX(ctx context.Context) { // SetValue(v+v). // }). // Exec(ctx) -// func (ncb *NodeCreateBulk) OnConflict(opts ...sql.ConflictOption) *NodeUpsertBulk { ncb.conflict = opts return &NodeUpsertBulk{ @@ -523,7 +518,6 @@ func (ncb *NodeCreateBulk) OnConflict(opts ...sql.ConflictOption) *NodeUpsertBul // client.Node.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ncb *NodeCreateBulk) OnConflictColumns(columns ...string) *NodeUpsertBulk { ncb.conflict = append(ncb.conflict, sql.ConflictColumns(columns...)) return &NodeUpsertBulk{ @@ -545,7 +539,6 @@ type NodeUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *NodeUpsertBulk) UpdateNewValues() *NodeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -557,7 +550,6 @@ func (u *NodeUpsertBulk) UpdateNewValues() *NodeUpsertBulk { // client.Node.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *NodeUpsertBulk) Ignore() *NodeUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index 54f9f1f17e..16bcd4513d 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -339,7 +339,6 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { // GroupBy(node.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { grbuild := &NodeGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { // client.Node.Query(). // Select(node.FieldValue). // Scan(ctx, &v) -// func (nq *NodeQuery) Select(fields ...string) *NodeSelect { nq.fields = append(nq.fields, fields...) selbuild := &NodeSelect{NodeQuery: nq} diff --git a/entc/integration/ent/pet_create.go b/entc/integration/ent/pet_create.go index 65a95e9e0c..27cf4e51ba 100644 --- a/entc/integration/ent/pet_create.go +++ b/entc/integration/ent/pet_create.go @@ -352,7 +352,6 @@ func (pc *PetCreate) createSpec() (*Pet, *sqlgraph.CreateSpec) { // SetAge(v+v). // }). // Exec(ctx) -// func (pc *PetCreate) OnConflict(opts ...sql.ConflictOption) *PetUpsertOne { pc.conflict = opts return &PetUpsertOne{ @@ -366,7 +365,6 @@ func (pc *PetCreate) OnConflict(opts ...sql.ConflictOption) *PetUpsertOne { // client.Pet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (pc *PetCreate) OnConflictColumns(columns ...string) *PetUpsertOne { pc.conflict = append(pc.conflict, sql.ConflictColumns(columns...)) return &PetUpsertOne{ @@ -473,7 +471,6 @@ func (u *PetUpsert) UpdateTrained() *PetUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *PetUpsertOne) UpdateNewValues() *PetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -482,10 +479,9 @@ func (u *PetUpsertOne) UpdateNewValues() *PetUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Pet.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Pet.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *PetUpsertOne) Ignore() *PetUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -732,7 +728,6 @@ func (pcb *PetCreateBulk) ExecX(ctx context.Context) { // SetAge(v+v). // }). // Exec(ctx) -// func (pcb *PetCreateBulk) OnConflict(opts ...sql.ConflictOption) *PetUpsertBulk { pcb.conflict = opts return &PetUpsertBulk{ @@ -746,7 +741,6 @@ func (pcb *PetCreateBulk) OnConflict(opts ...sql.ConflictOption) *PetUpsertBulk // client.Pet.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (pcb *PetCreateBulk) OnConflictColumns(columns ...string) *PetUpsertBulk { pcb.conflict = append(pcb.conflict, sql.ConflictColumns(columns...)) return &PetUpsertBulk{ @@ -768,7 +762,6 @@ type PetUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *PetUpsertBulk) UpdateNewValues() *PetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -780,7 +773,6 @@ func (u *PetUpsertBulk) UpdateNewValues() *PetUpsertBulk { // client.Pet.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *PetUpsertBulk) Ignore() *PetUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index 473972b757..4a76ddd827 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -339,7 +339,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldAge). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/ent/spec_create.go b/entc/integration/ent/spec_create.go index 974b9bfc5c..4414e24555 100644 --- a/entc/integration/ent/spec_create.go +++ b/entc/integration/ent/spec_create.go @@ -177,7 +177,6 @@ func (sc *SpecCreate) createSpec() (*Spec, *sqlgraph.CreateSpec) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (sc *SpecCreate) OnConflict(opts ...sql.ConflictOption) *SpecUpsertOne { sc.conflict = opts return &SpecUpsertOne{ @@ -191,7 +190,6 @@ func (sc *SpecCreate) OnConflict(opts ...sql.ConflictOption) *SpecUpsertOne { // client.Spec.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (sc *SpecCreate) OnConflictColumns(columns ...string) *SpecUpsertOne { sc.conflict = append(sc.conflict, sql.ConflictColumns(columns...)) return &SpecUpsertOne{ @@ -220,7 +218,6 @@ type ( // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *SpecUpsertOne) UpdateNewValues() *SpecUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -229,10 +226,9 @@ func (u *SpecUpsertOne) UpdateNewValues() *SpecUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Spec.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Spec.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *SpecUpsertOne) Ignore() *SpecUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -382,7 +378,6 @@ func (scb *SpecCreateBulk) ExecX(ctx context.Context) { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (scb *SpecCreateBulk) OnConflict(opts ...sql.ConflictOption) *SpecUpsertBulk { scb.conflict = opts return &SpecUpsertBulk{ @@ -396,7 +391,6 @@ func (scb *SpecCreateBulk) OnConflict(opts ...sql.ConflictOption) *SpecUpsertBul // client.Spec.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (scb *SpecCreateBulk) OnConflictColumns(columns ...string) *SpecUpsertBulk { scb.conflict = append(scb.conflict, sql.ConflictColumns(columns...)) return &SpecUpsertBulk{ @@ -418,7 +412,6 @@ type SpecUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *SpecUpsertBulk) UpdateNewValues() *SpecUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -430,7 +423,6 @@ func (u *SpecUpsertBulk) UpdateNewValues() *SpecUpsertBulk { // client.Spec.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *SpecUpsertBulk) Ignore() *SpecUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/task_create.go b/entc/integration/ent/task_create.go index 3694f33723..0d2893c95e 100644 --- a/entc/integration/ent/task_create.go +++ b/entc/integration/ent/task_create.go @@ -203,7 +203,6 @@ func (tc *TaskCreate) createSpec() (*Task, *sqlgraph.CreateSpec) { // SetPriority(v+v). // }). // Exec(ctx) -// func (tc *TaskCreate) OnConflict(opts ...sql.ConflictOption) *TaskUpsertOne { tc.conflict = opts return &TaskUpsertOne{ @@ -217,7 +216,6 @@ func (tc *TaskCreate) OnConflict(opts ...sql.ConflictOption) *TaskUpsertOne { // client.Task.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tc *TaskCreate) OnConflictColumns(columns ...string) *TaskUpsertOne { tc.conflict = append(tc.conflict, sql.ConflictColumns(columns...)) return &TaskUpsertOne{ @@ -282,7 +280,6 @@ func (u *TaskUpsert) ClearPriorities() *TaskUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TaskUpsertOne) UpdateNewValues() *TaskUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -291,10 +288,9 @@ func (u *TaskUpsertOne) UpdateNewValues() *TaskUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.Task.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.Task.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *TaskUpsertOne) Ignore() *TaskUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -492,7 +488,6 @@ func (tcb *TaskCreateBulk) ExecX(ctx context.Context) { // SetPriority(v+v). // }). // Exec(ctx) -// func (tcb *TaskCreateBulk) OnConflict(opts ...sql.ConflictOption) *TaskUpsertBulk { tcb.conflict = opts return &TaskUpsertBulk{ @@ -506,7 +501,6 @@ func (tcb *TaskCreateBulk) OnConflict(opts ...sql.ConflictOption) *TaskUpsertBul // client.Task.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (tcb *TaskCreateBulk) OnConflictColumns(columns ...string) *TaskUpsertBulk { tcb.conflict = append(tcb.conflict, sql.ConflictColumns(columns...)) return &TaskUpsertBulk{ @@ -528,7 +522,6 @@ type TaskUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *TaskUpsertBulk) UpdateNewValues() *TaskUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -540,7 +533,6 @@ func (u *TaskUpsertBulk) UpdateNewValues() *TaskUpsertBulk { // client.Task.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *TaskUpsertBulk) Ignore() *TaskUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/task_query.go b/entc/integration/ent/task_query.go index 3721488469..dcedd8e0d9 100644 --- a/entc/integration/ent/task_query.go +++ b/entc/integration/ent/task_query.go @@ -268,7 +268,6 @@ func (tq *TaskQuery) Clone() *TaskQuery { // GroupBy(enttask.FieldPriority). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { grbuild := &TaskGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -295,7 +294,6 @@ func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { // client.Task.Query(). // Select(enttask.FieldPriority). // Scan(ctx, &v) -// func (tq *TaskQuery) Select(fields ...string) *TaskSelect { tq.fields = append(tq.fields, fields...) selbuild := &TaskSelect{TaskQuery: tq} diff --git a/entc/integration/ent/user_create.go b/entc/integration/ent/user_create.go index c3f739deff..ef6b7a646f 100644 --- a/entc/integration/ent/user_create.go +++ b/entc/integration/ent/user_create.go @@ -821,7 +821,6 @@ func (uc *UserCreate) createSpec() (*User, *sqlgraph.CreateSpec) { // SetOptionalInt(v+v). // }). // Exec(ctx) -// func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { uc.conflict = opts return &UserUpsertOne{ @@ -835,7 +834,6 @@ func (uc *UserCreate) OnConflict(opts ...sql.ConflictOption) *UserUpsertOne { // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (uc *UserCreate) OnConflictColumns(columns ...string) *UserUpsertOne { uc.conflict = append(uc.conflict, sql.ConflictColumns(columns...)) return &UserUpsertOne{ @@ -1044,7 +1042,6 @@ func (u *UserUpsert) ClearSSOCert() *UserUpsert { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -1053,10 +1050,9 @@ func (u *UserUpsertOne) UpdateNewValues() *UserUpsertOne { // Ignore sets each column to itself in case of conflict. // Using this option is equivalent to using: // -// client.User.Create(). -// OnConflict(sql.ResolveWithIgnore()). -// Exec(ctx) -// +// client.User.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) func (u *UserUpsertOne) Ignore() *UserUpsertOne { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u @@ -1422,7 +1418,6 @@ func (ucb *UserCreateBulk) ExecX(ctx context.Context) { // SetOptionalInt(v+v). // }). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBulk { ucb.conflict = opts return &UserUpsertBulk{ @@ -1436,7 +1431,6 @@ func (ucb *UserCreateBulk) OnConflict(opts ...sql.ConflictOption) *UserUpsertBul // client.User.Create(). // OnConflict(sql.ConflictColumns(columns...)). // Exec(ctx) -// func (ucb *UserCreateBulk) OnConflictColumns(columns ...string) *UserUpsertBulk { ucb.conflict = append(ucb.conflict, sql.ConflictColumns(columns...)) return &UserUpsertBulk{ @@ -1458,7 +1452,6 @@ type UserUpsertBulk struct { // sql.ResolveWithNewValues(), // ). // Exec(ctx) -// func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) return u @@ -1470,7 +1463,6 @@ func (u *UserUpsertBulk) UpdateNewValues() *UserUpsertBulk { // client.User.Create(). // OnConflict(sql.ResolveWithIgnore()). // Exec(ctx) -// func (u *UserUpsertBulk) Ignore() *UserUpsertBulk { u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) return u diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 6c0865898b..1dcee6afd7 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -665,7 +665,6 @@ func (uq *UserQuery) WithParent(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldOptionalInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -692,7 +691,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldOptionalInt). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/gremlin/ent/card_query.go b/entc/integration/gremlin/ent/card_query.go index 1d431d6e7d..5437eee087 100644 --- a/entc/integration/gremlin/ent/card_query.go +++ b/entc/integration/gremlin/ent/card_query.go @@ -321,7 +321,6 @@ func (cq *CardQuery) WithSpec(opts ...func(*SpecQuery)) *CardQuery { // GroupBy(card.FieldCreateTime). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { grbuild := &CardGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -348,7 +347,6 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { // client.Card.Query(). // Select(card.FieldCreateTime). // Scan(ctx, &v) -// func (cq *CardQuery) Select(fields ...string) *CardSelect { cq.fields = append(cq.fields, fields...) selbuild := &CardSelect{CardQuery: cq} diff --git a/entc/integration/gremlin/ent/client.go b/entc/integration/gremlin/ent/client.go index 9c0f3499a5..5f5d7a6c05 100644 --- a/entc/integration/gremlin/ent/client.go +++ b/entc/integration/gremlin/ent/client.go @@ -162,7 +162,6 @@ func (c *Client) Tx(ctx context.Context) (*Tx, error) { // Card. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/gremlin/ent/comment_query.go b/entc/integration/gremlin/ent/comment_query.go index b32f35e34f..82fbc0e078 100644 --- a/entc/integration/gremlin/ent/comment_query.go +++ b/entc/integration/gremlin/ent/comment_query.go @@ -265,7 +265,6 @@ func (cq *CommentQuery) Clone() *CommentQuery { // GroupBy(comment.FieldUniqueInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy { grbuild := &CommentGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (cq *CommentQuery) GroupBy(field string, fields ...string) *CommentGroupBy // client.Comment.Query(). // Select(comment.FieldUniqueInt). // Scan(ctx, &v) -// func (cq *CommentQuery) Select(fields ...string) *CommentSelect { cq.fields = append(cq.fields, fields...) selbuild := &CommentSelect{CommentQuery: cq} diff --git a/entc/integration/gremlin/ent/ent.go b/entc/integration/gremlin/ent/ent.go index e99ecdbd00..9d500232c0 100644 --- a/entc/integration/gremlin/ent/ent.go +++ b/entc/integration/gremlin/ent/ent.go @@ -63,7 +63,6 @@ type AggregateFunc func(string, string) (string, *dsl.Traversal) // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(start, _ string) (string, *dsl.Traversal) { return fn(start, end) diff --git a/entc/integration/gremlin/ent/fieldtype_query.go b/entc/integration/gremlin/ent/fieldtype_query.go index a7705f3f7f..45d6e70861 100644 --- a/entc/integration/gremlin/ent/fieldtype_query.go +++ b/entc/integration/gremlin/ent/fieldtype_query.go @@ -265,7 +265,6 @@ func (ftq *FieldTypeQuery) Clone() *FieldTypeQuery { // GroupBy(fieldtype.FieldInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGroupBy { grbuild := &FieldTypeGroupBy{config: ftq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (ftq *FieldTypeQuery) GroupBy(field string, fields ...string) *FieldTypeGro // client.FieldType.Query(). // Select(fieldtype.FieldInt). // Scan(ctx, &v) -// func (ftq *FieldTypeQuery) Select(fields ...string) *FieldTypeSelect { ftq.fields = append(ftq.fields, fields...) selbuild := &FieldTypeSelect{FieldTypeQuery: ftq} diff --git a/entc/integration/gremlin/ent/file_query.go b/entc/integration/gremlin/ent/file_query.go index 72f870dfb3..fbec66c2df 100644 --- a/entc/integration/gremlin/ent/file_query.go +++ b/entc/integration/gremlin/ent/file_query.go @@ -348,7 +348,6 @@ func (fq *FileQuery) WithField(opts ...func(*FieldTypeQuery)) *FileQuery { // GroupBy(file.FieldSize). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { grbuild := &FileGroupBy{config: fq.config} grbuild.fields = append([]string{field}, fields...) @@ -375,7 +374,6 @@ func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { // client.File.Query(). // Select(file.FieldSize). // Scan(ctx, &v) -// func (fq *FileQuery) Select(fields ...string) *FileSelect { fq.fields = append(fq.fields, fields...) selbuild := &FileSelect{FileQuery: fq} diff --git a/entc/integration/gremlin/ent/filetype_query.go b/entc/integration/gremlin/ent/filetype_query.go index 98e0467a4a..c2723c6406 100644 --- a/entc/integration/gremlin/ent/filetype_query.go +++ b/entc/integration/gremlin/ent/filetype_query.go @@ -292,7 +292,6 @@ func (ftq *FileTypeQuery) WithFiles(opts ...func(*FileQuery)) *FileTypeQuery { // GroupBy(filetype.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroupBy { grbuild := &FileTypeGroupBy{config: ftq.config} grbuild.fields = append([]string{field}, fields...) @@ -319,7 +318,6 @@ func (ftq *FileTypeQuery) GroupBy(field string, fields ...string) *FileTypeGroup // client.FileType.Query(). // Select(filetype.FieldName). // Scan(ctx, &v) -// func (ftq *FileTypeQuery) Select(fields ...string) *FileTypeSelect { ftq.fields = append(ftq.fields, fields...) selbuild := &FileTypeSelect{FileTypeQuery: ftq} diff --git a/entc/integration/gremlin/ent/group_query.go b/entc/integration/gremlin/ent/group_query.go index a7f73f9519..16e2e59636 100644 --- a/entc/integration/gremlin/ent/group_query.go +++ b/entc/integration/gremlin/ent/group_query.go @@ -374,7 +374,6 @@ func (gq *GroupQuery) WithInfo(opts ...func(*GroupInfoQuery)) *GroupQuery { // GroupBy(group.FieldActive). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -401,7 +400,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldActive). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/gremlin/ent/groupinfo_query.go b/entc/integration/gremlin/ent/groupinfo_query.go index 373da12727..e7faf58c99 100644 --- a/entc/integration/gremlin/ent/groupinfo_query.go +++ b/entc/integration/gremlin/ent/groupinfo_query.go @@ -293,7 +293,6 @@ func (giq *GroupInfoQuery) WithGroups(opts ...func(*GroupQuery)) *GroupInfoQuery // GroupBy(groupinfo.FieldDesc). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGroupBy { grbuild := &GroupInfoGroupBy{config: giq.config} grbuild.fields = append([]string{field}, fields...) @@ -320,7 +319,6 @@ func (giq *GroupInfoQuery) GroupBy(field string, fields ...string) *GroupInfoGro // client.GroupInfo.Query(). // Select(groupinfo.FieldDesc). // Scan(ctx, &v) -// func (giq *GroupInfoQuery) Select(fields ...string) *GroupInfoSelect { giq.fields = append(giq.fields, fields...) selbuild := &GroupInfoSelect{GroupInfoQuery: giq} diff --git a/entc/integration/gremlin/ent/hook/hook.go b/entc/integration/gremlin/ent/hook/hook.go index a30ce5a2e0..885d47bb9c 100644 --- a/entc/integration/gremlin/ent/hook/hook.go +++ b/entc/integration/gremlin/ent/hook/hook.go @@ -303,7 +303,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -318,7 +317,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -326,7 +324,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -347,7 +344,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/gremlin/ent/item_query.go b/entc/integration/gremlin/ent/item_query.go index a58950879f..ac9a43b376 100644 --- a/entc/integration/gremlin/ent/item_query.go +++ b/entc/integration/gremlin/ent/item_query.go @@ -265,7 +265,6 @@ func (iq *ItemQuery) Clone() *ItemQuery { // GroupBy(item.FieldText). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { grbuild := &ItemGroupBy{config: iq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (iq *ItemQuery) GroupBy(field string, fields ...string) *ItemGroupBy { // client.Item.Query(). // Select(item.FieldText). // Scan(ctx, &v) -// func (iq *ItemQuery) Select(fields ...string) *ItemSelect { iq.fields = append(iq.fields, fields...) selbuild := &ItemSelect{ItemQuery: iq} diff --git a/entc/integration/gremlin/ent/node_query.go b/entc/integration/gremlin/ent/node_query.go index 96ca2733ca..638a368245 100644 --- a/entc/integration/gremlin/ent/node_query.go +++ b/entc/integration/gremlin/ent/node_query.go @@ -319,7 +319,6 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { // GroupBy(node.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { grbuild := &NodeGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -346,7 +345,6 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { // client.Node.Query(). // Select(node.FieldValue). // Scan(ctx, &v) -// func (nq *NodeQuery) Select(fields ...string) *NodeSelect { nq.fields = append(nq.fields, fields...) selbuild := &NodeSelect{NodeQuery: nq} diff --git a/entc/integration/gremlin/ent/pet_query.go b/entc/integration/gremlin/ent/pet_query.go index dbd3d2c665..ede2338a43 100644 --- a/entc/integration/gremlin/ent/pet_query.go +++ b/entc/integration/gremlin/ent/pet_query.go @@ -320,7 +320,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -347,7 +346,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldAge). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/gremlin/ent/task_query.go b/entc/integration/gremlin/ent/task_query.go index 72f7d36d13..dd5b5ded27 100644 --- a/entc/integration/gremlin/ent/task_query.go +++ b/entc/integration/gremlin/ent/task_query.go @@ -266,7 +266,6 @@ func (tq *TaskQuery) Clone() *TaskQuery { // GroupBy(enttask.FieldPriority). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { grbuild := &TaskGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -293,7 +292,6 @@ func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { // client.Task.Query(). // Select(enttask.FieldPriority). // Scan(ctx, &v) -// func (tq *TaskQuery) Select(fields ...string) *TaskSelect { tq.fields = append(tq.fields, fields...) selbuild := &TaskSelect{TaskQuery: tq} diff --git a/entc/integration/gremlin/ent/user_query.go b/entc/integration/gremlin/ent/user_query.go index 3253f9e309..72d3280fdb 100644 --- a/entc/integration/gremlin/ent/user_query.go +++ b/entc/integration/gremlin/ent/user_query.go @@ -562,7 +562,6 @@ func (uq *UserQuery) WithParent(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldOptionalInt). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -589,7 +588,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldOptionalInt). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/hooks/ent/card/card.go b/entc/integration/hooks/ent/card/card.go index 854c655e7d..5d8699c5b6 100644 --- a/entc/integration/hooks/ent/card/card.go +++ b/entc/integration/hooks/ent/card/card.go @@ -73,7 +73,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/hooks/ent/runtime" -// var ( Hooks [3]ent.Hook // DefaultNumber holds the default value on creation for the "number" field. diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index b931fdaceb..762b120c87 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -302,7 +302,6 @@ func (cq *CardQuery) WithOwner(opts ...func(*UserQuery)) *CardQuery { // GroupBy(card.FieldNumber). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { grbuild := &CardGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { // client.Card.Query(). // Select(card.FieldNumber). // Scan(ctx, &v) -// func (cq *CardQuery) Select(fields ...string) *CardSelect { cq.fields = append(cq.fields, fields...) selbuild := &CardSelect{CardQuery: cq} diff --git a/entc/integration/hooks/ent/client.go b/entc/integration/hooks/ent/client.go index f041244a8e..31e284a6a0 100644 --- a/entc/integration/hooks/ent/client.go +++ b/entc/integration/hooks/ent/client.go @@ -111,7 +111,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Card. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/hooks/ent/ent.go b/entc/integration/hooks/ent/ent.go index 77886da54f..02b29a402f 100644 --- a/entc/integration/hooks/ent/ent.go +++ b/entc/integration/hooks/ent/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/hooks/ent/hook/hook.go b/entc/integration/hooks/ent/hook/hook.go index 0cce63cc8c..df8b46d96d 100644 --- a/entc/integration/hooks/ent/hook/hook.go +++ b/entc/integration/hooks/ent/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -149,7 +148,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/hooks/ent/migrate/migrate.go b/entc/integration/hooks/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/hooks/ent/migrate/migrate.go +++ b/entc/integration/hooks/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/hooks/ent/user/user.go b/entc/integration/hooks/ent/user/user.go index 6cae19e204..c2eda5d4bd 100644 --- a/entc/integration/hooks/ent/user/user.go +++ b/entc/integration/hooks/ent/user/user.go @@ -87,7 +87,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/hooks/ent/runtime" -// var ( Hooks [2]ent.Hook // DefaultVersion holds the default value on creation for the "version" field. diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index 2422c6914f..c31f9e0ece 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -373,7 +373,6 @@ func (uq *UserQuery) WithBestFriend(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldVersion). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -400,7 +399,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldVersion). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/idtype/ent/client.go b/entc/integration/idtype/ent/client.go index 91d5335569..e6ae729e45 100644 --- a/entc/integration/idtype/ent/client.go +++ b/entc/integration/idtype/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/idtype/ent/ent.go b/entc/integration/idtype/ent/ent.go index ec0f601594..202ad72af9 100644 --- a/entc/integration/idtype/ent/ent.go +++ b/entc/integration/idtype/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/idtype/ent/hook/hook.go b/entc/integration/idtype/ent/hook/hook.go index 03ffe28f20..850448a681 100644 --- a/entc/integration/idtype/ent/hook/hook.go +++ b/entc/integration/idtype/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/idtype/ent/migrate/migrate.go b/entc/integration/idtype/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/idtype/ent/migrate/migrate.go +++ b/entc/integration/idtype/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index bfbac14447..528caaa2f0 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -372,7 +372,6 @@ func (uq *UserQuery) WithFollowing(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -399,7 +398,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/json/ent/client.go b/entc/integration/json/ent/client.go index 5d65e2aab2..a1c2f7da27 100644 --- a/entc/integration/json/ent/client.go +++ b/entc/integration/json/ent/client.go @@ -104,7 +104,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/json/ent/ent.go b/entc/integration/json/ent/ent.go index 5e7ca2bfe5..6bc5a69032 100644 --- a/entc/integration/json/ent/ent.go +++ b/entc/integration/json/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/json/ent/hook/hook.go b/entc/integration/json/ent/hook/hook.go index d8625f2a1d..0646e51331 100644 --- a/entc/integration/json/ent/hook/hook.go +++ b/entc/integration/json/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/json/ent/migrate/migrate.go b/entc/integration/json/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/json/ent/migrate/migrate.go +++ b/entc/integration/json/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index 089f53955d..880ef67946 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -265,7 +265,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldT). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldT). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/migrate/entv1/client.go b/entc/integration/migrate/entv1/client.go index 57b9a9622c..5afa54575f 100644 --- a/entc/integration/migrate/entv1/client.go +++ b/entc/integration/migrate/entv1/client.go @@ -123,7 +123,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Car. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/migrate/entv1/conversion_query.go b/entc/integration/migrate/entv1/conversion_query.go index 4ccb53f23f..ec14108dbe 100644 --- a/entc/integration/migrate/entv1/conversion_query.go +++ b/entc/integration/migrate/entv1/conversion_query.go @@ -265,7 +265,6 @@ func (cq *ConversionQuery) Clone() *ConversionQuery { // GroupBy(conversion.FieldName). // Aggregate(entv1.Count()). // Scan(ctx, &v) -// func (cq *ConversionQuery) GroupBy(field string, fields ...string) *ConversionGroupBy { grbuild := &ConversionGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (cq *ConversionQuery) GroupBy(field string, fields ...string) *ConversionGr // client.Conversion.Query(). // Select(conversion.FieldName). // Scan(ctx, &v) -// func (cq *ConversionQuery) Select(fields ...string) *ConversionSelect { cq.fields = append(cq.fields, fields...) selbuild := &ConversionSelect{ConversionQuery: cq} diff --git a/entc/integration/migrate/entv1/customtype_query.go b/entc/integration/migrate/entv1/customtype_query.go index 7c6f76b806..d6edb934bd 100644 --- a/entc/integration/migrate/entv1/customtype_query.go +++ b/entc/integration/migrate/entv1/customtype_query.go @@ -265,7 +265,6 @@ func (ctq *CustomTypeQuery) Clone() *CustomTypeQuery { // GroupBy(customtype.FieldCustom). // Aggregate(entv1.Count()). // Scan(ctx, &v) -// func (ctq *CustomTypeQuery) GroupBy(field string, fields ...string) *CustomTypeGroupBy { grbuild := &CustomTypeGroupBy{config: ctq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (ctq *CustomTypeQuery) GroupBy(field string, fields ...string) *CustomTypeG // client.CustomType.Query(). // Select(customtype.FieldCustom). // Scan(ctx, &v) -// func (ctq *CustomTypeQuery) Select(fields ...string) *CustomTypeSelect { ctq.fields = append(ctq.fields, fields...) selbuild := &CustomTypeSelect{CustomTypeQuery: ctq} diff --git a/entc/integration/migrate/entv1/ent.go b/entc/integration/migrate/entv1/ent.go index 9a613fc916..9be0f5082b 100644 --- a/entc/integration/migrate/entv1/ent.go +++ b/entc/integration/migrate/entv1/ent.go @@ -91,7 +91,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(entv1.As(entv1.Sum(field1), "sum_field1"), (entv1.As(entv1.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/migrate/entv1/hook/hook.go b/entc/integration/migrate/entv1/hook/hook.go index 07c5489490..c7363549d5 100644 --- a/entc/integration/migrate/entv1/hook/hook.go +++ b/entc/integration/migrate/entv1/hook/hook.go @@ -160,7 +160,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk entv1.Hook, cond Condition) entv1.Hook { return func(next entv1.Mutator) entv1.Mutator { return entv1.MutateFunc(func(ctx context.Context, m entv1.Mutation) (entv1.Value, error) { @@ -175,7 +174,6 @@ func If(hk entv1.Hook, cond Condition) entv1.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, entv1.Delete|entv1.Create) -// func On(hk entv1.Hook, op entv1.Op) entv1.Hook { return If(hk, HasOp(op)) } @@ -183,7 +181,6 @@ func On(hk entv1.Hook, op entv1.Op) entv1.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, entv1.Update|entv1.UpdateOne) -// func Unless(hk entv1.Hook, op entv1.Op) entv1.Hook { return If(hk, Not(HasOp(op))) } @@ -204,7 +201,6 @@ func FixedError(err error) entv1.Hook { // Reject(entv1.Delete|entv1.Update), // } // } -// func Reject(op entv1.Op) entv1.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/migrate/entv1/migrate/migrate.go b/entc/integration/migrate/entv1/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/migrate/entv1/migrate/migrate.go +++ b/entc/integration/migrate/entv1/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index de475e2c51..c4ce772b9b 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -408,7 +408,6 @@ func (uq *UserQuery) WithCar(opts ...func(*CarQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(entv1.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -435,7 +434,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index a0a810532a..3a634cc732 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -302,7 +302,6 @@ func (cq *CarQuery) WithOwner(opts ...func(*UserQuery)) *CarQuery { // GroupBy(car.FieldName). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { grbuild := &CarGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { // client.Car.Query(). // Select(car.FieldName). // Scan(ctx, &v) -// func (cq *CarQuery) Select(fields ...string) *CarSelect { cq.fields = append(cq.fields, fields...) selbuild := &CarSelect{CarQuery: cq} diff --git a/entc/integration/migrate/entv2/client.go b/entc/integration/migrate/entv2/client.go index 97c7c9f848..7deeac9e86 100644 --- a/entc/integration/migrate/entv2/client.go +++ b/entc/integration/migrate/entv2/client.go @@ -141,7 +141,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Car. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/migrate/entv2/conversion_query.go b/entc/integration/migrate/entv2/conversion_query.go index b4ae02192e..cd1f8a5945 100644 --- a/entc/integration/migrate/entv2/conversion_query.go +++ b/entc/integration/migrate/entv2/conversion_query.go @@ -265,7 +265,6 @@ func (cq *ConversionQuery) Clone() *ConversionQuery { // GroupBy(conversion.FieldName). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (cq *ConversionQuery) GroupBy(field string, fields ...string) *ConversionGroupBy { grbuild := &ConversionGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (cq *ConversionQuery) GroupBy(field string, fields ...string) *ConversionGr // client.Conversion.Query(). // Select(conversion.FieldName). // Scan(ctx, &v) -// func (cq *ConversionQuery) Select(fields ...string) *ConversionSelect { cq.fields = append(cq.fields, fields...) selbuild := &ConversionSelect{ConversionQuery: cq} diff --git a/entc/integration/migrate/entv2/customtype_query.go b/entc/integration/migrate/entv2/customtype_query.go index 1e676173b8..64d73dd63b 100644 --- a/entc/integration/migrate/entv2/customtype_query.go +++ b/entc/integration/migrate/entv2/customtype_query.go @@ -265,7 +265,6 @@ func (ctq *CustomTypeQuery) Clone() *CustomTypeQuery { // GroupBy(customtype.FieldCustom). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (ctq *CustomTypeQuery) GroupBy(field string, fields ...string) *CustomTypeGroupBy { grbuild := &CustomTypeGroupBy{config: ctq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (ctq *CustomTypeQuery) GroupBy(field string, fields ...string) *CustomTypeG // client.CustomType.Query(). // Select(customtype.FieldCustom). // Scan(ctx, &v) -// func (ctq *CustomTypeQuery) Select(fields ...string) *CustomTypeSelect { ctq.fields = append(ctq.fields, fields...) selbuild := &CustomTypeSelect{CustomTypeQuery: ctq} diff --git a/entc/integration/migrate/entv2/ent.go b/entc/integration/migrate/entv2/ent.go index 0636090147..413aff84ed 100644 --- a/entc/integration/migrate/entv2/ent.go +++ b/entc/integration/migrate/entv2/ent.go @@ -97,7 +97,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(entv2.As(entv2.Sum(field1), "sum_field1"), (entv2.As(entv2.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/migrate/entv2/hook/hook.go b/entc/integration/migrate/entv2/hook/hook.go index be39b1bcae..ebeb57de2e 100644 --- a/entc/integration/migrate/entv2/hook/hook.go +++ b/entc/integration/migrate/entv2/hook/hook.go @@ -199,7 +199,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk entv2.Hook, cond Condition) entv2.Hook { return func(next entv2.Mutator) entv2.Mutator { return entv2.MutateFunc(func(ctx context.Context, m entv2.Mutation) (entv2.Value, error) { @@ -214,7 +213,6 @@ func If(hk entv2.Hook, cond Condition) entv2.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, entv2.Delete|entv2.Create) -// func On(hk entv2.Hook, op entv2.Op) entv2.Hook { return If(hk, HasOp(op)) } @@ -222,7 +220,6 @@ func On(hk entv2.Hook, op entv2.Op) entv2.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, entv2.Update|entv2.UpdateOne) -// func Unless(hk entv2.Hook, op entv2.Op) entv2.Hook { return If(hk, Not(HasOp(op))) } @@ -243,7 +240,6 @@ func FixedError(err error) entv2.Hook { // Reject(entv2.Delete|entv2.Update), // } // } -// func Reject(op entv2.Op) entv2.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/migrate/entv2/media_query.go b/entc/integration/migrate/entv2/media_query.go index d1649cef5c..205ef6b759 100644 --- a/entc/integration/migrate/entv2/media_query.go +++ b/entc/integration/migrate/entv2/media_query.go @@ -265,7 +265,6 @@ func (mq *MediaQuery) Clone() *MediaQuery { // GroupBy(media.FieldSource). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (mq *MediaQuery) GroupBy(field string, fields ...string) *MediaGroupBy { grbuild := &MediaGroupBy{config: mq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (mq *MediaQuery) GroupBy(field string, fields ...string) *MediaGroupBy { // client.Media.Query(). // Select(media.FieldSource). // Scan(ctx, &v) -// func (mq *MediaQuery) Select(fields ...string) *MediaSelect { mq.fields = append(mq.fields, fields...) selbuild := &MediaSelect{MediaQuery: mq} diff --git a/entc/integration/migrate/entv2/migrate/migrate.go b/entc/integration/migrate/entv2/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/migrate/entv2/migrate/migrate.go +++ b/entc/integration/migrate/entv2/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index 56d21bd623..fdce5e4d85 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -302,7 +302,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldName). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldName). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index 0a5db6c3d6..b7797d3e51 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -373,7 +373,6 @@ func (uq *UserQuery) WithFriends(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldMixedString). // Aggregate(entv2.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -400,7 +399,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldMixedString). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/migrate/versioned/client.go b/entc/integration/migrate/versioned/client.go index 64b3ed6b1c..dc64e9693d 100644 --- a/entc/integration/migrate/versioned/client.go +++ b/entc/integration/migrate/versioned/client.go @@ -110,7 +110,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/migrate/versioned/ent.go b/entc/integration/migrate/versioned/ent.go index 2d9c9cb970..e73d025816 100644 --- a/entc/integration/migrate/versioned/ent.go +++ b/entc/integration/migrate/versioned/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(versioned.As(versioned.Sum(field1), "sum_field1"), (versioned.As(versioned.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/migrate/versioned/group_query.go b/entc/integration/migrate/versioned/group_query.go index 25709230f5..384cd64640 100644 --- a/entc/integration/migrate/versioned/group_query.go +++ b/entc/integration/migrate/versioned/group_query.go @@ -265,7 +265,6 @@ func (gq *GroupQuery) Clone() *GroupQuery { // GroupBy(group.FieldName). // Aggregate(versioned.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/migrate/versioned/hook/hook.go b/entc/integration/migrate/versioned/hook/hook.go index faccc20380..4b1300ad8c 100644 --- a/entc/integration/migrate/versioned/hook/hook.go +++ b/entc/integration/migrate/versioned/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk versioned.Hook, cond Condition) versioned.Hook { return func(next versioned.Mutator) versioned.Mutator { return versioned.MutateFunc(func(ctx context.Context, m versioned.Mutation) (versioned.Value, error) { @@ -149,7 +148,6 @@ func If(hk versioned.Hook, cond Condition) versioned.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, versioned.Delete|versioned.Create) -// func On(hk versioned.Hook, op versioned.Op) versioned.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk versioned.Hook, op versioned.Op) versioned.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, versioned.Update|versioned.UpdateOne) -// func Unless(hk versioned.Hook, op versioned.Op) versioned.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) versioned.Hook { // Reject(versioned.Delete|versioned.Update), // } // } -// func Reject(op versioned.Op) versioned.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/migrate/versioned/migrate/migrate.go b/entc/integration/migrate/versioned/migrate/migrate.go index 76d4cf2c00..9b2b43c5e7 100644 --- a/entc/integration/migrate/versioned/migrate/migrate.go +++ b/entc/integration/migrate/versioned/migrate/migrate.go @@ -92,10 +92,9 @@ func (s *Schema) NamedDiff(ctx context.Context, name string, opts ...schema.Migr // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/migrate/versioned/user_query.go b/entc/integration/migrate/versioned/user_query.go index 1d826ad45c..5591f20d70 100644 --- a/entc/integration/migrate/versioned/user_query.go +++ b/entc/integration/migrate/versioned/user_query.go @@ -265,7 +265,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldAge). // Aggregate(versioned.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/multischema/ent/client.go b/entc/integration/multischema/ent/client.go index fa0667af66..361d637661 100644 --- a/entc/integration/multischema/ent/client.go +++ b/entc/integration/multischema/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/multischema/ent/ent.go b/entc/integration/multischema/ent/ent.go index 5ec2b26cd9..cb7d7cfc66 100644 --- a/entc/integration/multischema/ent/ent.go +++ b/entc/integration/multischema/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/multischema/ent/group_query.go b/entc/integration/multischema/ent/group_query.go index d3dcd159b7..4fcdc6d5d2 100644 --- a/entc/integration/multischema/ent/group_query.go +++ b/entc/integration/multischema/ent/group_query.go @@ -307,7 +307,6 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { // GroupBy(group.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -334,7 +333,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/multischema/ent/hook/hook.go b/entc/integration/multischema/ent/hook/hook.go index a5fa27054e..800d701583 100644 --- a/entc/integration/multischema/ent/hook/hook.go +++ b/entc/integration/multischema/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/multischema/ent/migrate/migrate.go b/entc/integration/multischema/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/multischema/ent/migrate/migrate.go +++ b/entc/integration/multischema/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/multischema/ent/pet_query.go b/entc/integration/multischema/ent/pet_query.go index ccde0bfeec..a9c24e112c 100644 --- a/entc/integration/multischema/ent/pet_query.go +++ b/entc/integration/multischema/ent/pet_query.go @@ -306,7 +306,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -333,7 +332,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldName). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/multischema/ent/user_query.go b/entc/integration/multischema/ent/user_query.go index 552ef51e05..90b0d30693 100644 --- a/entc/integration/multischema/ent/user_query.go +++ b/entc/integration/multischema/ent/user_query.go @@ -346,7 +346,6 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -373,7 +372,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/privacy/ent/client.go b/entc/integration/privacy/ent/client.go index 512b40e82a..82c04b05f8 100644 --- a/entc/integration/privacy/ent/client.go +++ b/entc/integration/privacy/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Task. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/privacy/ent/ent.go b/entc/integration/privacy/ent/ent.go index 49a44edb9a..d473add65b 100644 --- a/entc/integration/privacy/ent/ent.go +++ b/entc/integration/privacy/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/privacy/ent/hook/hook.go b/entc/integration/privacy/ent/hook/hook.go index ca88c86c49..75c8b859a1 100644 --- a/entc/integration/privacy/ent/hook/hook.go +++ b/entc/integration/privacy/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/privacy/ent/migrate/migrate.go b/entc/integration/privacy/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/privacy/ent/migrate/migrate.go +++ b/entc/integration/privacy/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/privacy/ent/task/task.go b/entc/integration/privacy/ent/task/task.go index 4558f1ed13..e8a1fc68ce 100644 --- a/entc/integration/privacy/ent/task/task.go +++ b/entc/integration/privacy/ent/task/task.go @@ -86,7 +86,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/privacy/ent/runtime" -// var ( Hooks [2]ent.Hook Policy ent.Policy diff --git a/entc/integration/privacy/ent/task_query.go b/entc/integration/privacy/ent/task_query.go index b2e0d9ba37..18695e6d55 100644 --- a/entc/integration/privacy/ent/task_query.go +++ b/entc/integration/privacy/ent/task_query.go @@ -340,7 +340,6 @@ func (tq *TaskQuery) WithOwner(opts ...func(*UserQuery)) *TaskQuery { // GroupBy(task.FieldTitle). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { grbuild := &TaskGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -367,7 +366,6 @@ func (tq *TaskQuery) GroupBy(field string, fields ...string) *TaskGroupBy { // client.Task.Query(). // Select(task.FieldTitle). // Scan(ctx, &v) -// func (tq *TaskQuery) Select(fields ...string) *TaskSelect { tq.fields = append(tq.fields, fields...) selbuild := &TaskSelect{TaskQuery: tq} diff --git a/entc/integration/privacy/ent/team/team.go b/entc/integration/privacy/ent/team/team.go index bf237d535d..a6db9753ae 100644 --- a/entc/integration/privacy/ent/team/team.go +++ b/entc/integration/privacy/ent/team/team.go @@ -65,7 +65,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/privacy/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/entc/integration/privacy/ent/team_query.go b/entc/integration/privacy/ent/team_query.go index bcfb0b46c1..eb395fae8f 100644 --- a/entc/integration/privacy/ent/team_query.go +++ b/entc/integration/privacy/ent/team_query.go @@ -339,7 +339,6 @@ func (tq *TeamQuery) WithUsers(opts ...func(*UserQuery)) *TeamQuery { // GroupBy(team.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TeamQuery) GroupBy(field string, fields ...string) *TeamGroupBy { grbuild := &TeamGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (tq *TeamQuery) GroupBy(field string, fields ...string) *TeamGroupBy { // client.Team.Query(). // Select(team.FieldName). // Scan(ctx, &v) -// func (tq *TeamQuery) Select(fields ...string) *TeamSelect { tq.fields = append(tq.fields, fields...) selbuild := &TeamSelect{TeamQuery: tq} diff --git a/entc/integration/privacy/ent/user/user.go b/entc/integration/privacy/ent/user/user.go index 75f9ed5fd6..f841805219 100644 --- a/entc/integration/privacy/ent/user/user.go +++ b/entc/integration/privacy/ent/user/user.go @@ -67,7 +67,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/entc/integration/privacy/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/entc/integration/privacy/ent/user_query.go b/entc/integration/privacy/ent/user_query.go index 3a7da2e003..20765c5e4a 100644 --- a/entc/integration/privacy/ent/user_query.go +++ b/entc/integration/privacy/ent/user_query.go @@ -339,7 +339,6 @@ func (uq *UserQuery) WithTasks(opts ...func(*TaskQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/entc/integration/template/ent/client.go b/entc/integration/template/ent/client.go index 33ed103e98..846f48f87a 100644 --- a/entc/integration/template/ent/client.go +++ b/entc/integration/template/ent/client.go @@ -126,7 +126,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/entc/integration/template/ent/ent.go b/entc/integration/template/ent/ent.go index 0e25a861d0..e2189cdd8f 100644 --- a/entc/integration/template/ent/ent.go +++ b/entc/integration/template/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index f2ea4c0e5e..fd097021ee 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -268,7 +268,6 @@ func (gq *GroupQuery) Clone() *GroupQuery { // GroupBy(group.FieldMaxUsers). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -295,7 +294,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldMaxUsers). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/entc/integration/template/ent/hook/hook.go b/entc/integration/template/ent/hook/hook.go index aaa762247b..5432988b8b 100644 --- a/entc/integration/template/ent/hook/hook.go +++ b/entc/integration/template/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/entc/integration/template/ent/migrate/migrate.go b/entc/integration/template/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/entc/integration/template/ent/migrate/migrate.go +++ b/entc/integration/template/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index 9c2f6acd4c..af425768ed 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -305,7 +305,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -332,7 +331,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldAge). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index dfe7d9da3a..46b3e35839 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -340,7 +340,6 @@ func (uq *UserQuery) WithFriends(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -367,7 +366,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index bdc45f2051..75836c5d43 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -302,7 +302,6 @@ func (cq *CityQuery) WithStreets(opts ...func(*StreetQuery)) *CityQuery { // GroupBy(city.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CityQuery) GroupBy(field string, fields ...string) *CityGroupBy { grbuild := &CityGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CityQuery) GroupBy(field string, fields ...string) *CityGroupBy { // client.City.Query(). // Select(city.FieldName). // Scan(ctx, &v) -// func (cq *CityQuery) Select(fields ...string) *CitySelect { cq.fields = append(cq.fields, fields...) selbuild := &CitySelect{CityQuery: cq} diff --git a/examples/edgeindex/ent/client.go b/examples/edgeindex/ent/client.go index d654cb43f0..8cce0e7bbc 100644 --- a/examples/edgeindex/ent/client.go +++ b/examples/edgeindex/ent/client.go @@ -111,7 +111,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // City. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/edgeindex/ent/ent.go b/examples/edgeindex/ent/ent.go index 30ba83903b..16428edf01 100644 --- a/examples/edgeindex/ent/ent.go +++ b/examples/edgeindex/ent/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/edgeindex/ent/hook/hook.go b/examples/edgeindex/ent/hook/hook.go index fed195a5ae..cc3111b187 100644 --- a/examples/edgeindex/ent/hook/hook.go +++ b/examples/edgeindex/ent/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -149,7 +148,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/edgeindex/ent/migrate/migrate.go b/examples/edgeindex/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/edgeindex/ent/migrate/migrate.go +++ b/examples/edgeindex/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index 5fb72d2eea..87a51bda81 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -302,7 +302,6 @@ func (sq *StreetQuery) WithCity(opts ...func(*CityQuery)) *StreetQuery { // GroupBy(street.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (sq *StreetQuery) GroupBy(field string, fields ...string) *StreetGroupBy { grbuild := &StreetGroupBy{config: sq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (sq *StreetQuery) GroupBy(field string, fields ...string) *StreetGroupBy { // client.Street.Query(). // Select(street.FieldName). // Scan(ctx, &v) -// func (sq *StreetQuery) Select(fields ...string) *StreetSelect { sq.fields = append(sq.fields, fields...) selbuild := &StreetSelect{StreetQuery: sq} diff --git a/examples/entcpkg/ent/client.go b/examples/entcpkg/ent/client.go index 589f302ab4..a48bd1e1da 100644 --- a/examples/entcpkg/ent/client.go +++ b/examples/entcpkg/ent/client.go @@ -104,7 +104,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/entcpkg/ent/ent.go b/examples/entcpkg/ent/ent.go index 759314ae94..a0571cdca9 100644 --- a/examples/entcpkg/ent/ent.go +++ b/examples/entcpkg/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/entcpkg/ent/hook/hook.go b/examples/entcpkg/ent/hook/hook.go index 66c5583c6f..fd167c741b 100644 --- a/examples/entcpkg/ent/hook/hook.go +++ b/examples/entcpkg/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/entcpkg/ent/migrate/migrate.go b/examples/entcpkg/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/entcpkg/ent/migrate/migrate.go +++ b/examples/entcpkg/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index 1e46c2b79a..179802abcd 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -265,7 +265,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/fs/ent/client.go b/examples/fs/ent/client.go index 0bf06c1688..1dbdb8f639 100644 --- a/examples/fs/ent/client.go +++ b/examples/fs/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // File. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/fs/ent/ent.go b/examples/fs/ent/ent.go index 8f93afcaf5..d05b0f3a56 100644 --- a/examples/fs/ent/ent.go +++ b/examples/fs/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/fs/ent/file_query.go b/examples/fs/ent/file_query.go index 2e840666fc..f39fb168c4 100644 --- a/examples/fs/ent/file_query.go +++ b/examples/fs/ent/file_query.go @@ -336,7 +336,6 @@ func (fq *FileQuery) WithChildren(opts ...func(*FileQuery)) *FileQuery { // GroupBy(file.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { grbuild := &FileGroupBy{config: fq.config} grbuild.fields = append([]string{field}, fields...) @@ -363,7 +362,6 @@ func (fq *FileQuery) GroupBy(field string, fields ...string) *FileGroupBy { // client.File.Query(). // Select(file.FieldName). // Scan(ctx, &v) -// func (fq *FileQuery) Select(fields ...string) *FileSelect { fq.fields = append(fq.fields, fields...) selbuild := &FileSelect{FileQuery: fq} diff --git a/examples/fs/ent/hook/hook.go b/examples/fs/ent/hook/hook.go index 120ef155c8..05ad379dc6 100644 --- a/examples/fs/ent/hook/hook.go +++ b/examples/fs/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/fs/ent/migrate/migrate.go b/examples/fs/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/fs/ent/migrate/migrate.go +++ b/examples/fs/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/m2m2types/ent/client.go b/examples/m2m2types/ent/client.go index c8b6542409..ebc6b97def 100644 --- a/examples/m2m2types/ent/client.go +++ b/examples/m2m2types/ent/client.go @@ -111,7 +111,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/m2m2types/ent/ent.go b/examples/m2m2types/ent/ent.go index fbc3597193..8649038bde 100644 --- a/examples/m2m2types/ent/ent.go +++ b/examples/m2m2types/ent/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index 6e54a0ab58..7d00cbc908 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -302,7 +302,6 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { // GroupBy(group.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/examples/m2m2types/ent/hook/hook.go b/examples/m2m2types/ent/hook/hook.go index 30088eaa8b..5e964a0901 100644 --- a/examples/m2m2types/ent/hook/hook.go +++ b/examples/m2m2types/ent/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -149,7 +148,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/m2m2types/ent/migrate/migrate.go b/examples/m2m2types/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/m2m2types/ent/migrate/migrate.go +++ b/examples/m2m2types/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index 32346d194d..b1d13f0d51 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -302,7 +302,6 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/m2mbidi/ent/client.go b/examples/m2mbidi/ent/client.go index 48924d94f3..05b96b7b4b 100644 --- a/examples/m2mbidi/ent/client.go +++ b/examples/m2mbidi/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/m2mbidi/ent/ent.go b/examples/m2mbidi/ent/ent.go index b1291b70e0..56861f00a6 100644 --- a/examples/m2mbidi/ent/ent.go +++ b/examples/m2mbidi/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/m2mbidi/ent/hook/hook.go b/examples/m2mbidi/ent/hook/hook.go index 800a8992b9..a1ee95d355 100644 --- a/examples/m2mbidi/ent/hook/hook.go +++ b/examples/m2mbidi/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/m2mbidi/ent/migrate/migrate.go b/examples/m2mbidi/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/m2mbidi/ent/migrate/migrate.go +++ b/examples/m2mbidi/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index a8da3c6cb2..c37013f807 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -301,7 +301,6 @@ func (uq *UserQuery) WithFriends(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/m2mrecur/ent/client.go b/examples/m2mrecur/ent/client.go index 3ba911fcc6..56abde669b 100644 --- a/examples/m2mrecur/ent/client.go +++ b/examples/m2mrecur/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/m2mrecur/ent/ent.go b/examples/m2mrecur/ent/ent.go index 9fcb97684f..e56bd0fe09 100644 --- a/examples/m2mrecur/ent/ent.go +++ b/examples/m2mrecur/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/m2mrecur/ent/hook/hook.go b/examples/m2mrecur/ent/hook/hook.go index ecd0774ef6..dd3a74dc86 100644 --- a/examples/m2mrecur/ent/hook/hook.go +++ b/examples/m2mrecur/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/m2mrecur/ent/migrate/migrate.go b/examples/m2mrecur/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/m2mrecur/ent/migrate/migrate.go +++ b/examples/m2mrecur/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index ffda237cc8..87c9bea46f 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -336,7 +336,6 @@ func (uq *UserQuery) WithFollowing(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -363,7 +362,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/o2m2types/ent/client.go b/examples/o2m2types/ent/client.go index 7276135c62..638f58398f 100644 --- a/examples/o2m2types/ent/client.go +++ b/examples/o2m2types/ent/client.go @@ -111,7 +111,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Pet. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/o2m2types/ent/ent.go b/examples/o2m2types/ent/ent.go index cb359b6491..af1afc5162 100644 --- a/examples/o2m2types/ent/ent.go +++ b/examples/o2m2types/ent/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/o2m2types/ent/hook/hook.go b/examples/o2m2types/ent/hook/hook.go index 04ea79b6df..31ce0dc1d5 100644 --- a/examples/o2m2types/ent/hook/hook.go +++ b/examples/o2m2types/ent/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -149,7 +148,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/o2m2types/ent/migrate/migrate.go b/examples/o2m2types/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/o2m2types/ent/migrate/migrate.go +++ b/examples/o2m2types/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index 846c8e4cc5..dbe262d96f 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -302,7 +302,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldName). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 65813d78ff..8685552b91 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -302,7 +302,6 @@ func (uq *UserQuery) WithPets(opts ...func(*PetQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/o2mrecur/ent/client.go b/examples/o2mrecur/ent/client.go index ffc9813d2c..e68814c359 100644 --- a/examples/o2mrecur/ent/client.go +++ b/examples/o2mrecur/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Node. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/o2mrecur/ent/ent.go b/examples/o2mrecur/ent/ent.go index 1408ac3af9..ba6310b23a 100644 --- a/examples/o2mrecur/ent/ent.go +++ b/examples/o2mrecur/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/o2mrecur/ent/hook/hook.go b/examples/o2mrecur/ent/hook/hook.go index 8c475b0182..12561bc781 100644 --- a/examples/o2mrecur/ent/hook/hook.go +++ b/examples/o2mrecur/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/o2mrecur/ent/migrate/migrate.go b/examples/o2mrecur/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/o2mrecur/ent/migrate/migrate.go +++ b/examples/o2mrecur/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index 3613827692..0ce094af35 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -337,7 +337,6 @@ func (nq *NodeQuery) WithChildren(opts ...func(*NodeQuery)) *NodeQuery { // GroupBy(node.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { grbuild := &NodeGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -364,7 +363,6 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { // client.Node.Query(). // Select(node.FieldValue). // Scan(ctx, &v) -// func (nq *NodeQuery) Select(fields ...string) *NodeSelect { nq.fields = append(nq.fields, fields...) selbuild := &NodeSelect{NodeQuery: nq} diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index 2e1ac31a41..653b638f12 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -302,7 +302,6 @@ func (cq *CardQuery) WithOwner(opts ...func(*UserQuery)) *CardQuery { // GroupBy(card.FieldExpired). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { grbuild := &CardGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CardQuery) GroupBy(field string, fields ...string) *CardGroupBy { // client.Card.Query(). // Select(card.FieldExpired). // Scan(ctx, &v) -// func (cq *CardQuery) Select(fields ...string) *CardSelect { cq.fields = append(cq.fields, fields...) selbuild := &CardSelect{CardQuery: cq} diff --git a/examples/o2o2types/ent/client.go b/examples/o2o2types/ent/client.go index a807db3118..7c7a468ea9 100644 --- a/examples/o2o2types/ent/client.go +++ b/examples/o2o2types/ent/client.go @@ -111,7 +111,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Card. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/o2o2types/ent/ent.go b/examples/o2o2types/ent/ent.go index 9eb4f506d6..4a27bfd4c6 100644 --- a/examples/o2o2types/ent/ent.go +++ b/examples/o2o2types/ent/ent.go @@ -87,7 +87,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/o2o2types/ent/hook/hook.go b/examples/o2o2types/ent/hook/hook.go index 5e2a54314c..ce1b867c19 100644 --- a/examples/o2o2types/ent/hook/hook.go +++ b/examples/o2o2types/ent/hook/hook.go @@ -134,7 +134,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -149,7 +148,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -157,7 +155,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -178,7 +175,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/o2o2types/ent/migrate/migrate.go b/examples/o2o2types/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/o2o2types/ent/migrate/migrate.go +++ b/examples/o2o2types/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index 160539149b..50258c6120 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -302,7 +302,6 @@ func (uq *UserQuery) WithCard(opts ...func(*CardQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/o2obidi/ent/client.go b/examples/o2obidi/ent/client.go index 1b11d0c17e..7bbc0a8d05 100644 --- a/examples/o2obidi/ent/client.go +++ b/examples/o2obidi/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/o2obidi/ent/ent.go b/examples/o2obidi/ent/ent.go index 875086c93e..3bfa19b61a 100644 --- a/examples/o2obidi/ent/ent.go +++ b/examples/o2obidi/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/o2obidi/ent/hook/hook.go b/examples/o2obidi/ent/hook/hook.go index ef65c148da..225812fad2 100644 --- a/examples/o2obidi/ent/hook/hook.go +++ b/examples/o2obidi/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/o2obidi/ent/migrate/migrate.go b/examples/o2obidi/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/o2obidi/ent/migrate/migrate.go +++ b/examples/o2obidi/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index 5b5613272b..258155abe8 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -301,7 +301,6 @@ func (uq *UserQuery) WithSpouse(opts ...func(*UserQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -328,7 +327,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/o2orecur/ent/client.go b/examples/o2orecur/ent/client.go index 915afab075..a7c5386d9f 100644 --- a/examples/o2orecur/ent/client.go +++ b/examples/o2orecur/ent/client.go @@ -105,7 +105,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Node. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/o2orecur/ent/ent.go b/examples/o2orecur/ent/ent.go index 5c08dd2e03..860bd9bb9a 100644 --- a/examples/o2orecur/ent/ent.go +++ b/examples/o2orecur/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/o2orecur/ent/hook/hook.go b/examples/o2orecur/ent/hook/hook.go index 37b5e18bd7..d9e62d6d29 100644 --- a/examples/o2orecur/ent/hook/hook.go +++ b/examples/o2orecur/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/o2orecur/ent/migrate/migrate.go b/examples/o2orecur/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/o2orecur/ent/migrate/migrate.go +++ b/examples/o2orecur/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index 957a0246e5..80375bac28 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -337,7 +337,6 @@ func (nq *NodeQuery) WithNext(opts ...func(*NodeQuery)) *NodeQuery { // GroupBy(node.FieldValue). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { grbuild := &NodeGroupBy{config: nq.config} grbuild.fields = append([]string{field}, fields...) @@ -364,7 +363,6 @@ func (nq *NodeQuery) GroupBy(field string, fields ...string) *NodeGroupBy { // client.Node.Query(). // Select(node.FieldValue). // Scan(ctx, &v) -// func (nq *NodeQuery) Select(fields ...string) *NodeSelect { nq.fields = append(nq.fields, fields...) selbuild := &NodeSelect{NodeQuery: nq} diff --git a/examples/privacyadmin/ent/client.go b/examples/privacyadmin/ent/client.go index 935c976690..1246d98581 100644 --- a/examples/privacyadmin/ent/client.go +++ b/examples/privacyadmin/ent/client.go @@ -104,7 +104,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/privacyadmin/ent/ent.go b/examples/privacyadmin/ent/ent.go index 6204d8abce..7ac042932e 100644 --- a/examples/privacyadmin/ent/ent.go +++ b/examples/privacyadmin/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/privacyadmin/ent/hook/hook.go b/examples/privacyadmin/ent/hook/hook.go index 6d89d23cf4..88f7328477 100644 --- a/examples/privacyadmin/ent/hook/hook.go +++ b/examples/privacyadmin/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/privacyadmin/ent/migrate/migrate.go b/examples/privacyadmin/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/privacyadmin/ent/migrate/migrate.go +++ b/examples/privacyadmin/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/privacyadmin/ent/user/user.go b/examples/privacyadmin/ent/user/user.go index 70902be988..85dec258f8 100644 --- a/examples/privacyadmin/ent/user/user.go +++ b/examples/privacyadmin/ent/user/user.go @@ -42,7 +42,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/examples/privacyadmin/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/examples/privacyadmin/ent/user_query.go b/examples/privacyadmin/ent/user_query.go index cef1f2ea3e..54700dd702 100644 --- a/examples/privacyadmin/ent/user_query.go +++ b/examples/privacyadmin/ent/user_query.go @@ -266,7 +266,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -293,7 +292,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldName). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/privacytenant/ent/client.go b/examples/privacytenant/ent/client.go index ca89d96fa0..63ea0a00a0 100644 --- a/examples/privacytenant/ent/client.go +++ b/examples/privacytenant/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/privacytenant/ent/ent.go b/examples/privacytenant/ent/ent.go index 7831d84619..f8598d1424 100644 --- a/examples/privacytenant/ent/ent.go +++ b/examples/privacytenant/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/privacytenant/ent/group/group.go b/examples/privacytenant/ent/group/group.go index 326cb6a4db..736bf232bd 100644 --- a/examples/privacytenant/ent/group/group.go +++ b/examples/privacytenant/ent/group/group.go @@ -67,7 +67,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/examples/privacytenant/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/examples/privacytenant/ent/group_query.go b/examples/privacytenant/ent/group_query.go index 130b2fb6da..22ca45d361 100644 --- a/examples/privacytenant/ent/group_query.go +++ b/examples/privacytenant/ent/group_query.go @@ -339,7 +339,6 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { // GroupBy(group.FieldTenantID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldTenantID). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/examples/privacytenant/ent/hook/hook.go b/examples/privacytenant/ent/hook/hook.go index 99cf917f87..cf69c3fa9a 100644 --- a/examples/privacytenant/ent/hook/hook.go +++ b/examples/privacytenant/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/privacytenant/ent/migrate/migrate.go b/examples/privacytenant/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/privacytenant/ent/migrate/migrate.go +++ b/examples/privacytenant/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/privacytenant/ent/tenant/tenant.go b/examples/privacytenant/ent/tenant/tenant.go index 727c24ad89..ddd99cfafc 100644 --- a/examples/privacytenant/ent/tenant/tenant.go +++ b/examples/privacytenant/ent/tenant/tenant.go @@ -42,7 +42,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/examples/privacytenant/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/examples/privacytenant/ent/tenant_query.go b/examples/privacytenant/ent/tenant_query.go index 6bb2d4ddd3..fd7c5908ae 100644 --- a/examples/privacytenant/ent/tenant_query.go +++ b/examples/privacytenant/ent/tenant_query.go @@ -266,7 +266,6 @@ func (tq *TenantQuery) Clone() *TenantQuery { // GroupBy(tenant.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (tq *TenantQuery) GroupBy(field string, fields ...string) *TenantGroupBy { grbuild := &TenantGroupBy{config: tq.config} grbuild.fields = append([]string{field}, fields...) @@ -293,7 +292,6 @@ func (tq *TenantQuery) GroupBy(field string, fields ...string) *TenantGroupBy { // client.Tenant.Query(). // Select(tenant.FieldName). // Scan(ctx, &v) -// func (tq *TenantQuery) Select(fields ...string) *TenantSelect { tq.fields = append(tq.fields, fields...) selbuild := &TenantSelect{TenantQuery: tq} diff --git a/examples/privacytenant/ent/user/user.go b/examples/privacytenant/ent/user/user.go index a18df5c373..169e0f8701 100644 --- a/examples/privacytenant/ent/user/user.go +++ b/examples/privacytenant/ent/user/user.go @@ -70,7 +70,6 @@ func ValidColumn(column string) bool { // it should be imported in the main as follows: // // import _ "entgo.io/ent/examples/privacytenant/ent/runtime" -// var ( Hooks [1]ent.Hook Policy ent.Policy diff --git a/examples/privacytenant/ent/user_query.go b/examples/privacytenant/ent/user_query.go index e43c4c03e2..0374a115c5 100644 --- a/examples/privacytenant/ent/user_query.go +++ b/examples/privacytenant/ent/user_query.go @@ -339,7 +339,6 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { // GroupBy(user.FieldTenantID). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -366,7 +365,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldTenantID). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index 420b98f312..200a9d0a31 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -302,7 +302,6 @@ func (cq *CarQuery) WithOwner(opts ...func(*UserQuery)) *CarQuery { // GroupBy(car.FieldModel). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { grbuild := &CarGroupBy{config: cq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (cq *CarQuery) GroupBy(field string, fields ...string) *CarGroupBy { // client.Car.Query(). // Select(car.FieldModel). // Scan(ctx, &v) -// func (cq *CarQuery) Select(fields ...string) *CarSelect { cq.fields = append(cq.fields, fields...) selbuild := &CarSelect{CarQuery: cq} diff --git a/examples/start/ent/client.go b/examples/start/ent/client.go index 7846c4216a..fd873838ee 100644 --- a/examples/start/ent/client.go +++ b/examples/start/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Car. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/start/ent/ent.go b/examples/start/ent/ent.go index 52b0f26787..9be7d0cf7a 100644 --- a/examples/start/ent/ent.go +++ b/examples/start/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index bc5a6e0199..930535beaa 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -302,7 +302,6 @@ func (gq *GroupQuery) WithUsers(opts ...func(*UserQuery)) *GroupQuery { // GroupBy(group.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -329,7 +328,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/examples/start/ent/hook/hook.go b/examples/start/ent/hook/hook.go index dca16141f7..b4f7c9acf1 100644 --- a/examples/start/ent/hook/hook.go +++ b/examples/start/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/start/ent/migrate/migrate.go b/examples/start/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/start/ent/migrate/migrate.go +++ b/examples/start/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index 2be5dea23f..822e830405 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -338,7 +338,6 @@ func (uq *UserQuery) WithGroups(opts ...func(*GroupQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/traversal/ent/client.go b/examples/traversal/ent/client.go index f2f6771270..033d21e456 100644 --- a/examples/traversal/ent/client.go +++ b/examples/traversal/ent/client.go @@ -117,7 +117,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // Group. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/traversal/ent/ent.go b/examples/traversal/ent/ent.go index 61122aceb1..38134a6945 100644 --- a/examples/traversal/ent/ent.go +++ b/examples/traversal/ent/ent.go @@ -89,7 +89,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 47d8abb645..321b9703de 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -338,7 +338,6 @@ func (gq *GroupQuery) WithAdmin(opts ...func(*UserQuery)) *GroupQuery { // GroupBy(group.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { grbuild := &GroupGroupBy{config: gq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (gq *GroupQuery) GroupBy(field string, fields ...string) *GroupGroupBy { // client.Group.Query(). // Select(group.FieldName). // Scan(ctx, &v) -// func (gq *GroupQuery) Select(fields ...string) *GroupSelect { gq.fields = append(gq.fields, fields...) selbuild := &GroupSelect{GroupQuery: gq} diff --git a/examples/traversal/ent/hook/hook.go b/examples/traversal/ent/hook/hook.go index 9dc71a8230..5127136a9e 100644 --- a/examples/traversal/ent/hook/hook.go +++ b/examples/traversal/ent/hook/hook.go @@ -147,7 +147,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -162,7 +161,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -170,7 +168,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -191,7 +188,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/traversal/ent/migrate/migrate.go b/examples/traversal/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/traversal/ent/migrate/migrate.go +++ b/examples/traversal/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index 3a08eecc9b..2b07247b76 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -338,7 +338,6 @@ func (pq *PetQuery) WithOwner(opts ...func(*UserQuery)) *PetQuery { // GroupBy(pet.FieldName). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { grbuild := &PetGroupBy{config: pq.config} grbuild.fields = append([]string{field}, fields...) @@ -365,7 +364,6 @@ func (pq *PetQuery) GroupBy(field string, fields ...string) *PetGroupBy { // client.Pet.Query(). // Select(pet.FieldName). // Scan(ctx, &v) -// func (pq *PetQuery) Select(fields ...string) *PetSelect { pq.fields = append(pq.fields, fields...) selbuild := &PetSelect{PetQuery: pq} diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 9a1609efd0..2062a4b6d4 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -408,7 +408,6 @@ func (uq *UserQuery) WithManage(opts ...func(*GroupQuery)) *UserQuery { // GroupBy(user.FieldAge). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -435,7 +434,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldAge). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/examples/version/ent/client.go b/examples/version/ent/client.go index c29744c059..c20647b511 100644 --- a/examples/version/ent/client.go +++ b/examples/version/ent/client.go @@ -104,7 +104,6 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) // User. // Query(). // Count(ctx) -// func (c *Client) Debug() *Client { if c.debug { return c diff --git a/examples/version/ent/ent.go b/examples/version/ent/ent.go index 86e4f95e9a..23fbe60777 100644 --- a/examples/version/ent/ent.go +++ b/examples/version/ent/ent.go @@ -85,7 +85,6 @@ type AggregateFunc func(*sql.Selector) string // GroupBy(field1, field2). // Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). // Scan(ctx, &v) -// func As(fn AggregateFunc, end string) AggregateFunc { return func(s *sql.Selector) string { return sql.As(fn(s), end) diff --git a/examples/version/ent/hook/hook.go b/examples/version/ent/hook/hook.go index 8b59489db2..56b4faedda 100644 --- a/examples/version/ent/hook/hook.go +++ b/examples/version/ent/hook/hook.go @@ -121,7 +121,6 @@ func HasFields(field string, fields ...string) Condition { // If executes the given hook under condition. // // hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) -// func If(hk ent.Hook, cond Condition) ent.Hook { return func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { @@ -136,7 +135,6 @@ func If(hk ent.Hook, cond Condition) ent.Hook { // On executes the given hook only for the given operation. // // hook.On(Log, ent.Delete|ent.Create) -// func On(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, HasOp(op)) } @@ -144,7 +142,6 @@ func On(hk ent.Hook, op ent.Op) ent.Hook { // Unless skips the given hook only for the given operation. // // hook.Unless(Log, ent.Update|ent.UpdateOne) -// func Unless(hk ent.Hook, op ent.Op) ent.Hook { return If(hk, Not(HasOp(op))) } @@ -165,7 +162,6 @@ func FixedError(err error) ent.Hook { // Reject(ent.Delete|ent.Update), // } // } -// func Reject(op ent.Op) ent.Hook { hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) return On(hk, op) diff --git a/examples/version/ent/migrate/migrate.go b/examples/version/ent/migrate/migrate.go index 2a78c5d785..0a632cc3d3 100644 --- a/examples/version/ent/migrate/migrate.go +++ b/examples/version/ent/migrate/migrate.go @@ -60,10 +60,9 @@ func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...sche // WriteTo writes the schema changes to w instead of running them against the database. // -// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { // log.Fatal(err) -// } -// +// } func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) } diff --git a/examples/version/ent/user_query.go b/examples/version/ent/user_query.go index eb2b88feea..e568b46381 100644 --- a/examples/version/ent/user_query.go +++ b/examples/version/ent/user_query.go @@ -265,7 +265,6 @@ func (uq *UserQuery) Clone() *UserQuery { // GroupBy(user.FieldVersion). // Aggregate(ent.Count()). // Scan(ctx, &v) -// func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { grbuild := &UserGroupBy{config: uq.config} grbuild.fields = append([]string{field}, fields...) @@ -292,7 +291,6 @@ func (uq *UserQuery) GroupBy(field string, fields ...string) *UserGroupBy { // client.User.Query(). // Select(user.FieldVersion). // Scan(ctx, &v) -// func (uq *UserQuery) Select(fields ...string) *UserSelect { uq.fields = append(uq.fields, fields...) selbuild := &UserSelect{UserQuery: uq} diff --git a/go.mod b/go.mod index 6929f75dcc..28a8b34d4a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module entgo.io/ent -go 1.17 +go 1.18 require ( ariga.io/atlas v0.5.1-0.20220717122844-8593d7eb1a8e @@ -21,7 +21,7 @@ require ( github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 go.opencensus.io v0.23.0 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 - golang.org/x/tools v0.1.12 + golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa ) require ( diff --git a/go.sum b/go.sum index 73ef861d7f..26d7f28be2 100644 --- a/go.sum +++ b/go.sum @@ -144,6 +144,7 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -162,6 +163,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -174,6 +176,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -193,6 +196,10 @@ golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7 h1:M1gcVrIb2lSn2FIL19DG0 golang.org/x/tools v0.1.9-0.20211216111533-8d383106f7e7/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.1.13-0.20220804155011-3e0a5031e3ce h1:H5TuqNlBf25o53D/3XFjJDxs5N2imjjIyMfhVm1ybYs= +golang.org/x/tools v0.1.13-0.20220804155011-3e0a5031e3ce/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa h1:uKcci2q7Qtp6nMTC/AAvfNUAldFtJuHWV9/5QWiypts= +golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/schema/field/numeric.go b/schema/field/numeric.go index 0a40875d0b..1fd1e12e2a 100644 --- a/schema/field/numeric.go +++ b/schema/field/numeric.go @@ -189,7 +189,6 @@ func (b *intBuilder) DefaultFunc(fn interface{}) *intBuilder { // field.Int("int"). // Default(0). // UpdateDefault(GenNumber), -// func (b *intBuilder) UpdateDefault(fn interface{}) *intBuilder { b.desc.UpdateDefault = fn return b @@ -247,7 +246,6 @@ func (b *intBuilder) StorageKey(key string) *intBuilder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *intBuilder) SchemaType(types map[string]string) *intBuilder { b.desc.SchemaType = types return b @@ -265,7 +263,6 @@ func (b *intBuilder) SchemaType(types map[string]string) *intBuilder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *intBuilder) GoType(typ interface{}) *intBuilder { b.desc.goType(typ, intType) return b @@ -276,7 +273,6 @@ func (b *intBuilder) GoType(typ interface{}) *intBuilder { // // field.Int("int"). // Annotations(entgql.OrderField("INT")) -// func (b *intBuilder) Annotations(annotations ...schema.Annotation) *intBuilder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -358,7 +354,6 @@ func (b *uintBuilder) DefaultFunc(fn interface{}) *uintBuilder { // field.Uint("uint"). // Default(0). // UpdateDefault(GenNumber), -// func (b *uintBuilder) UpdateDefault(fn interface{}) *uintBuilder { b.desc.UpdateDefault = fn return b @@ -416,7 +411,6 @@ func (b *uintBuilder) StorageKey(key string) *uintBuilder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *uintBuilder) SchemaType(types map[string]string) *uintBuilder { b.desc.SchemaType = types return b @@ -434,7 +428,6 @@ func (b *uintBuilder) SchemaType(types map[string]string) *uintBuilder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *uintBuilder) GoType(typ interface{}) *uintBuilder { b.desc.goType(typ, uintType) return b @@ -445,7 +438,6 @@ func (b *uintBuilder) GoType(typ interface{}) *uintBuilder { // // field.Uint("uint"). // Annotations(entgql.OrderField("UINT")) -// func (b *uintBuilder) Annotations(annotations ...schema.Annotation) *uintBuilder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -537,7 +529,6 @@ func (b *int8Builder) DefaultFunc(fn interface{}) *int8Builder { // field.Int8("int8"). // Default(0). // UpdateDefault(GenNumber), -// func (b *int8Builder) UpdateDefault(fn interface{}) *int8Builder { b.desc.UpdateDefault = fn return b @@ -595,7 +586,6 @@ func (b *int8Builder) StorageKey(key string) *int8Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *int8Builder) SchemaType(types map[string]string) *int8Builder { b.desc.SchemaType = types return b @@ -613,7 +603,6 @@ func (b *int8Builder) SchemaType(types map[string]string) *int8Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *int8Builder) GoType(typ interface{}) *int8Builder { b.desc.goType(typ, int8Type) return b @@ -624,7 +613,6 @@ func (b *int8Builder) GoType(typ interface{}) *int8Builder { // // field.Int8("int8"). // Annotations(entgql.OrderField("INT8")) -// func (b *int8Builder) Annotations(annotations ...schema.Annotation) *int8Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -716,7 +704,6 @@ func (b *int16Builder) DefaultFunc(fn interface{}) *int16Builder { // field.Int16("int16"). // Default(0). // UpdateDefault(GenNumber), -// func (b *int16Builder) UpdateDefault(fn interface{}) *int16Builder { b.desc.UpdateDefault = fn return b @@ -774,7 +761,6 @@ func (b *int16Builder) StorageKey(key string) *int16Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *int16Builder) SchemaType(types map[string]string) *int16Builder { b.desc.SchemaType = types return b @@ -792,7 +778,6 @@ func (b *int16Builder) SchemaType(types map[string]string) *int16Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *int16Builder) GoType(typ interface{}) *int16Builder { b.desc.goType(typ, int16Type) return b @@ -803,7 +788,6 @@ func (b *int16Builder) GoType(typ interface{}) *int16Builder { // // field.Int16("int16"). // Annotations(entgql.OrderField("INT16")) -// func (b *int16Builder) Annotations(annotations ...schema.Annotation) *int16Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -895,7 +879,6 @@ func (b *int32Builder) DefaultFunc(fn interface{}) *int32Builder { // field.Int32("int32"). // Default(0). // UpdateDefault(GenNumber), -// func (b *int32Builder) UpdateDefault(fn interface{}) *int32Builder { b.desc.UpdateDefault = fn return b @@ -953,7 +936,6 @@ func (b *int32Builder) StorageKey(key string) *int32Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *int32Builder) SchemaType(types map[string]string) *int32Builder { b.desc.SchemaType = types return b @@ -971,7 +953,6 @@ func (b *int32Builder) SchemaType(types map[string]string) *int32Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *int32Builder) GoType(typ interface{}) *int32Builder { b.desc.goType(typ, int32Type) return b @@ -982,7 +963,6 @@ func (b *int32Builder) GoType(typ interface{}) *int32Builder { // // field.Int32("int32"). // Annotations(entgql.OrderField("INT32")) -// func (b *int32Builder) Annotations(annotations ...schema.Annotation) *int32Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1074,7 +1054,6 @@ func (b *int64Builder) DefaultFunc(fn interface{}) *int64Builder { // field.Int64("int64"). // Default(0). // UpdateDefault(GenNumber), -// func (b *int64Builder) UpdateDefault(fn interface{}) *int64Builder { b.desc.UpdateDefault = fn return b @@ -1132,7 +1111,6 @@ func (b *int64Builder) StorageKey(key string) *int64Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *int64Builder) SchemaType(types map[string]string) *int64Builder { b.desc.SchemaType = types return b @@ -1150,7 +1128,6 @@ func (b *int64Builder) SchemaType(types map[string]string) *int64Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *int64Builder) GoType(typ interface{}) *int64Builder { b.desc.goType(typ, int64Type) return b @@ -1161,7 +1138,6 @@ func (b *int64Builder) GoType(typ interface{}) *int64Builder { // // field.Int64("int64"). // Annotations(entgql.OrderField("INT64")) -// func (b *int64Builder) Annotations(annotations ...schema.Annotation) *int64Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1243,7 +1219,6 @@ func (b *uint8Builder) DefaultFunc(fn interface{}) *uint8Builder { // field.Uint8("uint8"). // Default(0). // UpdateDefault(GenNumber), -// func (b *uint8Builder) UpdateDefault(fn interface{}) *uint8Builder { b.desc.UpdateDefault = fn return b @@ -1301,7 +1276,6 @@ func (b *uint8Builder) StorageKey(key string) *uint8Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *uint8Builder) SchemaType(types map[string]string) *uint8Builder { b.desc.SchemaType = types return b @@ -1319,7 +1293,6 @@ func (b *uint8Builder) SchemaType(types map[string]string) *uint8Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *uint8Builder) GoType(typ interface{}) *uint8Builder { b.desc.goType(typ, uint8Type) return b @@ -1330,7 +1303,6 @@ func (b *uint8Builder) GoType(typ interface{}) *uint8Builder { // // field.Uint8("uint8"). // Annotations(entgql.OrderField("UINT8")) -// func (b *uint8Builder) Annotations(annotations ...schema.Annotation) *uint8Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1412,7 +1384,6 @@ func (b *uint16Builder) DefaultFunc(fn interface{}) *uint16Builder { // field.Uint16("uint16"). // Default(0). // UpdateDefault(GenNumber), -// func (b *uint16Builder) UpdateDefault(fn interface{}) *uint16Builder { b.desc.UpdateDefault = fn return b @@ -1470,7 +1441,6 @@ func (b *uint16Builder) StorageKey(key string) *uint16Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *uint16Builder) SchemaType(types map[string]string) *uint16Builder { b.desc.SchemaType = types return b @@ -1488,7 +1458,6 @@ func (b *uint16Builder) SchemaType(types map[string]string) *uint16Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *uint16Builder) GoType(typ interface{}) *uint16Builder { b.desc.goType(typ, uint16Type) return b @@ -1499,7 +1468,6 @@ func (b *uint16Builder) GoType(typ interface{}) *uint16Builder { // // field.Uint16("uint16"). // Annotations(entgql.OrderField("UINT16")) -// func (b *uint16Builder) Annotations(annotations ...schema.Annotation) *uint16Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1581,7 +1549,6 @@ func (b *uint32Builder) DefaultFunc(fn interface{}) *uint32Builder { // field.Uint32("uint32"). // Default(0). // UpdateDefault(GenNumber), -// func (b *uint32Builder) UpdateDefault(fn interface{}) *uint32Builder { b.desc.UpdateDefault = fn return b @@ -1639,7 +1606,6 @@ func (b *uint32Builder) StorageKey(key string) *uint32Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *uint32Builder) SchemaType(types map[string]string) *uint32Builder { b.desc.SchemaType = types return b @@ -1657,7 +1623,6 @@ func (b *uint32Builder) SchemaType(types map[string]string) *uint32Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *uint32Builder) GoType(typ interface{}) *uint32Builder { b.desc.goType(typ, uint32Type) return b @@ -1668,7 +1633,6 @@ func (b *uint32Builder) GoType(typ interface{}) *uint32Builder { // // field.Uint32("uint32"). // Annotations(entgql.OrderField("UINT32")) -// func (b *uint32Builder) Annotations(annotations ...schema.Annotation) *uint32Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1750,7 +1714,6 @@ func (b *uint64Builder) DefaultFunc(fn interface{}) *uint64Builder { // field.Uint64("uint64"). // Default(0). // UpdateDefault(GenNumber), -// func (b *uint64Builder) UpdateDefault(fn interface{}) *uint64Builder { b.desc.UpdateDefault = fn return b @@ -1808,7 +1771,6 @@ func (b *uint64Builder) StorageKey(key string) *uint64Builder { // SchemaType(map[string]string{ // dialect.Postgres: "CustomType", // }) -// func (b *uint64Builder) SchemaType(types map[string]string) *uint64Builder { b.desc.SchemaType = types return b @@ -1826,7 +1788,6 @@ func (b *uint64Builder) SchemaType(types map[string]string) *uint64Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *uint64Builder) GoType(typ interface{}) *uint64Builder { b.desc.goType(typ, uint64Type) return b @@ -1837,7 +1798,6 @@ func (b *uint64Builder) GoType(typ interface{}) *uint64Builder { // // field.Uint64("uint64"). // Annotations(entgql.OrderField("UINT64")) -// func (b *uint64Builder) Annotations(annotations ...schema.Annotation) *uint64Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -1977,7 +1937,6 @@ func (b *float64Builder) StorageKey(key string) *float64Builder { // dialect.MySQL: "decimal(5, 2)", // dialect.Postgres: "numeric(5, 2)", // }) -// func (b *float64Builder) SchemaType(types map[string]string) *float64Builder { b.desc.SchemaType = types return b @@ -1995,7 +1954,6 @@ func (b *float64Builder) SchemaType(types map[string]string) *float64Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *float64Builder) GoType(typ interface{}) *float64Builder { b.desc.goType(typ, float64Type) return b @@ -2006,7 +1964,6 @@ func (b *float64Builder) GoType(typ interface{}) *float64Builder { // // field.Float64("float64"). // Annotations(entgql.OrderField("FLOAT64")) -// func (b *float64Builder) Annotations(annotations ...schema.Annotation) *float64Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b @@ -2130,7 +2087,6 @@ func (b *float32Builder) StorageKey(key string) *float32Builder { // dialect.MySQL: "decimal(5, 2)", // dialect.Postgres: "numeric(5, 2)", // }) -// func (b *float32Builder) SchemaType(types map[string]string) *float32Builder { b.desc.SchemaType = types return b @@ -2148,7 +2104,6 @@ func (b *float32Builder) SchemaType(types map[string]string) *float32Builder { // func(t1 T) Add(t2 T) T { // return add(t1, t2) // } -// func (b *float32Builder) GoType(typ interface{}) *float32Builder { b.desc.goType(typ, float32Type) return b @@ -2159,7 +2114,6 @@ func (b *float32Builder) GoType(typ interface{}) *float32Builder { // // field.Float32("float32"). // Annotations(entgql.OrderField("FLOAT32")) -// func (b *float32Builder) Annotations(annotations ...schema.Annotation) *float32Builder { b.desc.Annotations = append(b.desc.Annotations, annotations...) return b