ent · a8m · May 25, 2023 · May 25, 2023
diff --git a/entc/gen/template/builder/create.tmpl b/entc/gen/template/builder/create.tmpl
@@ -17,7 +17,7 @@ in the LICENSE file in the root directory of this source tree.
 {{ end }}
 
 {{ $builder := $.CreateName }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.CreateReceiver }}
 {{ $mutation := print $receiver ".mutation" }}
 
 // {{ $builder }} is the builder for creating a {{ $.Name }} entity.
@@ -32,7 +32,7 @@ type {{ $builder }} struct {
 	{{- end }}
 }
 
-{{ with extend $ "Builder" $builder }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder }}
 	{{ template "setter" . }}
 {{ end }}
 
@@ -139,7 +139,7 @@ func ({{ $receiver }} *{{ $builder }}) check() error {
 	return nil
 }
 
-{{ with extend $ "Builder" $builder }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder }}
 	{{ $tmpl := printf "dialect/%s/create" $.Storage }}
 	{{ xtemplate $tmpl . }}
 {{ end }}

diff --git a/entc/gen/template/builder/delete.tmpl b/entc/gen/template/builder/delete.tmpl
@@ -18,7 +18,7 @@ import (
 )
 
 {{ $builder := $.DeleteName }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.DeleteReceiver }}
 {{ $mutation := print $receiver ".mutation" }}
 
 // {{ $builder }} is the builder for deleting a {{ $.Name }} entity.
@@ -49,7 +49,7 @@ func ({{ $receiver }} *{{ $builder }}) ExecX(ctx context.Context) int {
 	return {{ $n }}
 }
 
-{{ with extend $ "Builder" $builder }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder }}
 	{{ $tmpl := printf "dialect/%s/delete" $.Storage }}
 	{{ xtemplate $tmpl . }}
 {{ end }}
@@ -62,7 +62,7 @@ func ({{ $receiver }} *{{ $builder }}) ExecX(ctx context.Context) int {
 {{- end }}
 
 {{ $onebuilder := $.DeleteOneName }}
-{{ $oneReceiver := receiver $onebuilder }}
+{{ $oneReceiver := $.DeleteOneReceiver }}
 
 // {{ $onebuilder }} is the builder for deleting a single {{ $.Name }} entity.
 type {{ $onebuilder }} struct {

diff --git a/entc/gen/template/builder/setter.tmpl b/entc/gen/template/builder/setter.tmpl
@@ -8,7 +8,7 @@ in the LICENSE file in the root directory of this source tree.
 
 {{ define "setter" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $fields := $.Fields }}
 {{ $updater := false }}
 {{- if or (hasSuffix $builder "Update") (hasSuffix $builder "UpdateOne") }}

diff --git a/entc/gen/template/builder/update.tmpl b/entc/gen/template/builder/update.tmpl
@@ -16,7 +16,7 @@ in the LICENSE file in the root directory of this source tree.
 {{ end }}
 
 {{ $builder := $.UpdateName }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.UpdateReceiver }}
 {{ $mutation := print $receiver ".mutation" }}
 {{ $runtimeRequired := or $.NumHooks $.NumPolicy }}
 
@@ -32,11 +32,11 @@ func ({{ $receiver}} *{{ $builder }}) Where(ps ...predicate.{{ $.Name }}) *{{ $b
 	return {{ $receiver }}
 }
 
-{{ with extend $ "Builder" $builder }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder }}
 	{{ template "setter" . }}
 {{ end }}
 
-{{ with extend $ "Builder" $builder }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder }}
 	{{ template "update/edges" . }}
 {{ end }}
 
@@ -80,7 +80,7 @@ func ({{ $receiver }} *{{ $builder }}) ExecX(ctx context.Context) {
 	{{ template "update/checks" . }}
 {{ end }}
 
-{{ with extend $ "Builder" $builder "Package" $pkg }}
+{{ with extend $ "Receiver" $receiver "Builder" $builder "Package" $pkg }}
 	{{ $tmpl := printf "dialect/%s/update" $.Storage }}
 	{{ xtemplate $tmpl . }}
 {{ end }}
@@ -96,12 +96,12 @@ type {{ $onebuilder }} struct {
 	{{- template "update/fields" $ }}
 }
 
-{{ with extend $ "Builder" $onebuilder }}
+{{ with extend $ "Receiver" $receiver "Builder" $onebuilder }}
 	{{ template "setter" . }}
 {{ end }}
 
 
-{{ with extend $ "Builder" $onebuilder }}
+{{ with extend $ "Receiver" $receiver "Builder" $onebuilder }}
 	{{ template "update/edges" . }}
 {{ end }}
 
@@ -158,7 +158,7 @@ func ({{ $receiver }} *{{ $onebuilder }}) ExecX(ctx context.Context) {
 	{{ template "update/checks" . }}
 {{ end }}
 
-{{ with extend $ "Builder" $onebuilder "Package" $pkg }}
+{{ with extend $ "Receiver" $receiver "Builder" $onebuilder "Package" $pkg }}
 	{{ $tmpl := printf "dialect/%s/update" $.Storage }}
 	{{ xtemplate $tmpl . }}
 {{ end }}
@@ -186,7 +186,7 @@ func ({{ $receiver }} *{{ $onebuilder }}) ExecX(ctx context.Context) {
 {{/* shared edges removal between the two updaters */}}
 {{ define "update/edges" }}
 {{ $builder := pascal .Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := .Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation" }}
 
 {{ range $e := $.EdgesWithID }}

diff --git a/entc/gen/template/dialect/gremlin/create.tmpl b/entc/gen/template/dialect/gremlin/create.tmpl
@@ -8,7 +8,7 @@ in the LICENSE file in the root directory of this source tree.
 
 {{ define "dialect/gremlin/create" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation"  }}
 
 func ({{ $receiver }} *{{ $builder }}) gremlinSave(ctx context.Context) (*{{ $.Name }}, error) {
@@ -23,15 +23,15 @@ func ({{ $receiver }} *{{ $builder }}) gremlinSave(ctx context.Context) (*{{ $.N
 	if err, ok := isConstantError(res); ok {
 		return nil, err
 	}
-	{{ $.Receiver }} := &{{ $.Name }}{config: {{ $receiver }}.config}
-	if err := {{ $.Receiver }}.FromResponse(res); err != nil {
+	rnode := &{{ $.Name }}{config: {{ $receiver }}.config}
+	if err := rnode.FromResponse(res); err != nil {
 		return nil, err
 	}
 	{{- if $.HasOneFieldID }}
-		{{ $mutation }}.{{ $.ID.BuilderField }} = &{{ $.Receiver }} .{{ $.ID.StructField }}
+		{{ $mutation }}.{{ $.ID.BuilderField }} = &rnode.{{ $.ID.StructField }}
 		{{ $mutation }}.done = true
 	{{- end }}
-	return {{ $.Receiver }}, nil
+	return rnode, nil
 }
 
 func ({{ $receiver }} *{{ $builder }}) gremlin() *dsl.Traversal {

diff --git a/entc/gen/template/dialect/gremlin/delete.tmpl b/entc/gen/template/dialect/gremlin/delete.tmpl
@@ -8,7 +8,7 @@ in the LICENSE file in the root directory of this source tree.
 
 {{ define "dialect/gremlin/delete" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation" }}
 
 func ({{ $receiver}} *{{ $builder }}) gremlinExec(ctx context.Context) (int, error) {

diff --git a/entc/gen/template/dialect/gremlin/update.tmpl b/entc/gen/template/dialect/gremlin/update.tmpl
@@ -9,7 +9,7 @@ in the LICENSE file in the root directory of this source tree.
 {{ define "dialect/gremlin/update" }}
 {{ $pkg := $.Scope.Package }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation" }}
 {{ $one := hasSuffix $builder "One" }}
 {{ $zero := 0 }}{{ if $one }}{{ $zero = "nil" }}{{ end }}

diff --git a/entc/gen/template/dialect/sql/create.tmpl b/entc/gen/template/dialect/sql/create.tmpl
@@ -8,7 +8,7 @@ in the LICENSE file in the root directory of this source tree.
 
 {{ define "dialect/sql/create" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation"  }}
 
 func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name }}, error) {
@@ -139,7 +139,7 @@ func ({{ $receiver }} *{{ $builder }}) createSpec() (*{{ $.Name }}, *sqlgraph.Cr
 
 {{ define "dialect/sql/create_bulk" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 
 // Save creates the {{ $.Name }} entities in the database.
 func ({{ $receiver }} *{{ $builder }}) Save(ctx context.Context) ([]*{{ $.Name }}, error) {

diff --git a/entc/gen/template/dialect/sql/delete.tmpl b/entc/gen/template/dialect/sql/delete.tmpl
@@ -8,7 +8,7 @@ in the LICENSE file in the root directory of this source tree.
 
 {{ define "dialect/sql/delete" }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation" }}
 
 func ({{ $receiver}} *{{ $builder }}) sqlExec(ctx context.Context) (int, error) {

diff --git a/entc/gen/template/dialect/sql/feature/upsert.tmpl b/entc/gen/template/dialect/sql/feature/upsert.tmpl
@@ -26,14 +26,14 @@ in the LICENSE file in the root directory of this source tree.
 {{/* Template for passing the "OnConflict" options to the sqlgraph.CreateSpec. */}}
 {{- define "dialect/sql/create/spec/upsert" }}
 	{{- if $.FeatureEnabled "sql/upsert" }}
-		_spec.OnConflict = {{ pascal $.Scope.Builder | receiver }}.conflict
+		_spec.OnConflict = {{ $.Scope.Receiver }}.conflict
 	{{- end }}
 {{- end }}
 
 {{/* Template for passing the "OnConflict" options to the sqlgraph.BatchCreateSpec. */}}
 {{- define "dialect/sql/create_bulk/spec/upsert" }}
 	{{- if $.FeatureEnabled "sql/upsert" }}
-		spec.OnConflict = {{ pascal $.Scope.Builder | receiver }}.conflict
+		spec.OnConflict = {{ $.Scope.Receiver }}.conflict
 	{{- end }}
 {{- end }}
 
@@ -47,7 +47,7 @@ in the LICENSE file in the root directory of this source tree.
 {{ define "helper/upsertone" }}
 {{ $pkg := base $.Config.Package }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $upsertOne := print $.Name "UpsertOne" }}
 {{ $upsertSet := print $.Name "Upsert" }}
 
@@ -264,7 +264,7 @@ func (u *{{ $upsertOne }}) ExecX(ctx context.Context) {
 {{ define "helper/upsertbulk" }}
 {{ $pkg := base $.Config.Package }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $upsertBulk := print $.Name "UpsertBulk" }}
 {{ $upsertSet := print $.Name "Upsert" }}
 {{ $udfID := false }}{{ if $.HasOneFieldID }}{{ $udfID = $.ID.UserDefined }}{{ end }}

diff --git a/entc/gen/template/dialect/sql/update.tmpl b/entc/gen/template/dialect/sql/update.tmpl
@@ -18,7 +18,7 @@ in the LICENSE file in the root directory of this source tree.
 {{ define "dialect/sql/update" }}
 {{ $pkg := $.Scope.Package }}
 {{ $builder := pascal $.Scope.Builder }}
-{{ $receiver := receiver $builder }}
+{{ $receiver := $.Scope.Receiver }}
 {{ $mutation := print $receiver ".mutation" }}
 {{ $one := hasSuffix $builder "One" }}
 {{- $zero := 0 }}{{ if $one }}{{ $zero = "nil" }}{{ end }}
@@ -186,7 +186,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
 
 {{ define "dialect/sql/defedge" }}
 	{{- $e := $.Scope.Edge -}}
-	{{- $receiver := pascal $.Scope.Builder | receiver -}}
+	{{- $receiver := $.Scope.Receiver -}}
 	edge := &sqlgraph.EdgeSpec{
 		Rel: sqlgraph.{{ $e.Rel.Type }},
 		Inverse: {{ $e.IsInverse }},

diff --git a/entc/gen/type.go b/entc/gen/type.go
@@ -329,7 +329,11 @@ func (t Type) PackageAlias() string { return t.alias }
 // Receiver returns the receiver name of this node. It makes sure the
 // receiver names doesn't conflict with import names.
 func (t Type) Receiver() string {
-	return receiver(t.Name)
+	r := receiver(t.Name)
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
 }
 
 // hasEdge returns true if this type as an edge (reverse or assoc)
@@ -822,31 +826,85 @@ func (t Type) CreateName() string {
 	return pascal(t.Name) + "Create"
 }
 
+// CreateReceiver returns the receiver name of the create-builder for this type.
+func (t Type) CreateReceiver() string {
+	r := receiver(t.CreateName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // CreateBulkName returns the struct name denoting the create-bulk-builder for this type.
 func (t Type) CreateBulkName() string {
 	return pascal(t.Name) + "CreateBulk"
 }
 
+// CreateBulReceiver returns the receiver name of the create-bulk-builder for this type.
+func (t Type) CreateBulReceiver() string {
+	r := receiver(t.CreateBulkName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // UpdateName returns the struct name denoting the update-builder for this type.
 func (t Type) UpdateName() string {
 	return pascal(t.Name) + "Update"
 }
 
+// UpdateReceiver returns the receiver name of the update-builder for this type.
+func (t Type) UpdateReceiver() string {
+	r := receiver(t.UpdateName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // UpdateOneName returns the struct name denoting the update-one-builder for this type.
 func (t Type) UpdateOneName() string {
 	return pascal(t.Name) + "UpdateOne"
 }
 
+// UpdateOneReceiver returns the receiver name of the update-one-builder for this type.
+func (t Type) UpdateOneReceiver() string {
+	r := receiver(t.UpdateOneName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // DeleteName returns the struct name denoting the delete-builder for this type.
 func (t Type) DeleteName() string {
 	return pascal(t.Name) + "Delete"
 }
 
+// DeleteReceiver returns the receiver name of the delete-builder for this type.
+func (t Type) DeleteReceiver() string {
+	r := receiver(t.DeleteName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // DeleteOneName returns the struct name denoting the delete-one-builder for this type.
 func (t Type) DeleteOneName() string {
 	return pascal(t.Name) + "DeleteOne"
 }
 
+// DeleteOneReceiver returns the receiver name of the delete-one-builder for this type.
+func (t Type) DeleteOneReceiver() string {
+	r := receiver(t.DeleteOneName())
+	if t.Package() == r {
+		return "_" + r
+	}
+	return r
+}
+
 // MutationName returns the struct name of the mutation builder for this type.
 func (t Type) MutationName() string {
 	return pascal(t.Name) + "Mutation"