golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/gen: avoid conflict between package and receiver names (#3563)

Browse Source
This commit is contained in:
Ariel Mashraki
2023-05-25 14:45:57 +03:00
committed by GitHub
parent d7b3a6c4f4
commit 633d021f48
57 changed files with 3611 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entc/gen/template/dialect/sql/create.tmpl
View File

@@ -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) {

2
entc/gen/template/dialect/sql/delete.tmpl
View File

@@ -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) {

8
entc/gen/template/dialect/sql/feature/upsert.tmpl
View File

@@ -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 }}

4
entc/gen/template/dialect/sql/update.tmpl
View File

@@ -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 }},