From 461ab4a3e4022c21c6729b2ea9e37316e99f21c3 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki <7413593+a8m@users.noreply.github.com> Date: Sat, 20 Aug 2022 18:09:12 +0300 Subject: [PATCH] entc/gen: unexpose upsert setters for immutable fields (#2875) --- .../template/dialect/sql/feature/upsert.tmpl | 4 +- entc/integration/ent/card_create.go | 80 ------------------- entc/integration/ent/license_create.go | 40 ---------- entc/integration/ent/task_create.go | 40 ---------- 4 files changed, 2 insertions(+), 162 deletions(-) diff --git a/entc/gen/template/dialect/sql/feature/upsert.tmpl b/entc/gen/template/dialect/sql/feature/upsert.tmpl index f9d04384b..49724bba7 100644 --- a/entc/gen/template/dialect/sql/feature/upsert.tmpl +++ b/entc/gen/template/dialect/sql/feature/upsert.tmpl @@ -108,7 +108,7 @@ type ( } ) -{{ range $f := $.Fields }} +{{ range $f := $.MutableFields }} {{ $func := print "Set" $f.StructField }} // {{ $func }} sets the "{{ $f.Name }}" field. func (u *{{ $upsertSet }}) {{ $func }}(v {{ $f.Type }}) *{{ $upsertSet }} { @@ -408,7 +408,7 @@ func (u *{{ $upsertBulk }}) ExecX(ctx context.Context) { {{ $upsert := $.Scope.Upsert }} {{ $upsertSet := $.Scope.UpsertSet }} -{{ range $f := $.Fields }} +{{ range $f := $.MutableFields }} {{ $func := print "Set" $f.StructField }} // {{ $func }} sets the "{{ $f.Name }}" field. func (u *{{ $upsert }}) {{ $func }}(v {{ $f.Type }}) *{{ $upsert }} { diff --git a/entc/integration/ent/card_create.go b/entc/integration/ent/card_create.go index 6e0abb362..4b22b4818 100644 --- a/entc/integration/ent/card_create.go +++ b/entc/integration/ent/card_create.go @@ -398,18 +398,6 @@ type ( } ) -// SetCreateTime sets the "create_time" field. -func (u *CardUpsert) SetCreateTime(v time.Time) *CardUpsert { - u.Set(card.FieldCreateTime, v) - return u -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *CardUpsert) UpdateCreateTime() *CardUpsert { - u.SetExcluded(card.FieldCreateTime) - return u -} - // SetUpdateTime sets the "update_time" field. func (u *CardUpsert) SetUpdateTime(v time.Time) *CardUpsert { u.Set(card.FieldUpdateTime, v) @@ -440,18 +428,6 @@ func (u *CardUpsert) AddBalance(v float64) *CardUpsert { return u } -// SetNumber sets the "number" field. -func (u *CardUpsert) SetNumber(v string) *CardUpsert { - u.Set(card.FieldNumber, v) - return u -} - -// UpdateNumber sets the "number" field to the value that was provided on create. -func (u *CardUpsert) UpdateNumber() *CardUpsert { - u.SetExcluded(card.FieldNumber) - return u -} - // SetName sets the "name" field. func (u *CardUpsert) SetName(v string) *CardUpsert { u.Set(card.FieldName, v) @@ -518,20 +494,6 @@ func (u *CardUpsertOne) Update(set func(*CardUpsert)) *CardUpsertOne { return u } -// SetCreateTime sets the "create_time" field. -func (u *CardUpsertOne) SetCreateTime(v time.Time) *CardUpsertOne { - return u.Update(func(s *CardUpsert) { - s.SetCreateTime(v) - }) -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *CardUpsertOne) UpdateCreateTime() *CardUpsertOne { - return u.Update(func(s *CardUpsert) { - s.UpdateCreateTime() - }) -} - // SetUpdateTime sets the "update_time" field. func (u *CardUpsertOne) SetUpdateTime(v time.Time) *CardUpsertOne { return u.Update(func(s *CardUpsert) { @@ -567,20 +529,6 @@ func (u *CardUpsertOne) UpdateBalance() *CardUpsertOne { }) } -// SetNumber sets the "number" field. -func (u *CardUpsertOne) SetNumber(v string) *CardUpsertOne { - return u.Update(func(s *CardUpsert) { - s.SetNumber(v) - }) -} - -// UpdateNumber sets the "number" field to the value that was provided on create. -func (u *CardUpsertOne) UpdateNumber() *CardUpsertOne { - return u.Update(func(s *CardUpsert) { - s.UpdateNumber() - }) -} - // SetName sets the "name" field. func (u *CardUpsertOne) SetName(v string) *CardUpsertOne { return u.Update(func(s *CardUpsert) { @@ -812,20 +760,6 @@ func (u *CardUpsertBulk) Update(set func(*CardUpsert)) *CardUpsertBulk { return u } -// SetCreateTime sets the "create_time" field. -func (u *CardUpsertBulk) SetCreateTime(v time.Time) *CardUpsertBulk { - return u.Update(func(s *CardUpsert) { - s.SetCreateTime(v) - }) -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *CardUpsertBulk) UpdateCreateTime() *CardUpsertBulk { - return u.Update(func(s *CardUpsert) { - s.UpdateCreateTime() - }) -} - // SetUpdateTime sets the "update_time" field. func (u *CardUpsertBulk) SetUpdateTime(v time.Time) *CardUpsertBulk { return u.Update(func(s *CardUpsert) { @@ -861,20 +795,6 @@ func (u *CardUpsertBulk) UpdateBalance() *CardUpsertBulk { }) } -// SetNumber sets the "number" field. -func (u *CardUpsertBulk) SetNumber(v string) *CardUpsertBulk { - return u.Update(func(s *CardUpsert) { - s.SetNumber(v) - }) -} - -// UpdateNumber sets the "number" field to the value that was provided on create. -func (u *CardUpsertBulk) UpdateNumber() *CardUpsertBulk { - return u.Update(func(s *CardUpsert) { - s.UpdateNumber() - }) -} - // SetName sets the "name" field. func (u *CardUpsertBulk) SetName(v string) *CardUpsertBulk { return u.Update(func(s *CardUpsert) { diff --git a/entc/integration/ent/license_create.go b/entc/integration/ent/license_create.go index 73554b544..fe03ad8cc 100644 --- a/entc/integration/ent/license_create.go +++ b/entc/integration/ent/license_create.go @@ -257,18 +257,6 @@ type ( } ) -// SetCreateTime sets the "create_time" field. -func (u *LicenseUpsert) SetCreateTime(v time.Time) *LicenseUpsert { - u.Set(license.FieldCreateTime, v) - return u -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *LicenseUpsert) UpdateCreateTime() *LicenseUpsert { - u.SetExcluded(license.FieldCreateTime) - return u -} - // SetUpdateTime sets the "update_time" field. func (u *LicenseUpsert) SetUpdateTime(v time.Time) *LicenseUpsert { u.Set(license.FieldUpdateTime, v) @@ -332,20 +320,6 @@ func (u *LicenseUpsertOne) Update(set func(*LicenseUpsert)) *LicenseUpsertOne { return u } -// SetCreateTime sets the "create_time" field. -func (u *LicenseUpsertOne) SetCreateTime(v time.Time) *LicenseUpsertOne { - return u.Update(func(s *LicenseUpsert) { - s.SetCreateTime(v) - }) -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *LicenseUpsertOne) UpdateCreateTime() *LicenseUpsertOne { - return u.Update(func(s *LicenseUpsert) { - s.UpdateCreateTime() - }) -} - // SetUpdateTime sets the "update_time" field. func (u *LicenseUpsertOne) SetUpdateTime(v time.Time) *LicenseUpsertOne { return u.Update(func(s *LicenseUpsert) { @@ -573,20 +547,6 @@ func (u *LicenseUpsertBulk) Update(set func(*LicenseUpsert)) *LicenseUpsertBulk return u } -// SetCreateTime sets the "create_time" field. -func (u *LicenseUpsertBulk) SetCreateTime(v time.Time) *LicenseUpsertBulk { - return u.Update(func(s *LicenseUpsert) { - s.SetCreateTime(v) - }) -} - -// UpdateCreateTime sets the "create_time" field to the value that was provided on create. -func (u *LicenseUpsertBulk) UpdateCreateTime() *LicenseUpsertBulk { - return u.Update(func(s *LicenseUpsert) { - s.UpdateCreateTime() - }) -} - // SetUpdateTime sets the "update_time" field. func (u *LicenseUpsertBulk) SetUpdateTime(v time.Time) *LicenseUpsertBulk { return u.Update(func(s *LicenseUpsert) { diff --git a/entc/integration/ent/task_create.go b/entc/integration/ent/task_create.go index f929b5855..c0e76e708 100644 --- a/entc/integration/ent/task_create.go +++ b/entc/integration/ent/task_create.go @@ -302,18 +302,6 @@ func (u *TaskUpsert) ClearPriorities() *TaskUpsert { return u } -// SetCreatedAt sets the "created_at" field. -func (u *TaskUpsert) SetCreatedAt(v time.Time) *TaskUpsert { - u.Set(enttask.FieldCreatedAt, v) - return u -} - -// UpdateCreatedAt sets the "created_at" field to the value that was provided on create. -func (u *TaskUpsert) UpdateCreatedAt() *TaskUpsert { - u.SetExcluded(enttask.FieldCreatedAt) - return u -} - // UpdateNewValues updates the mutable fields using the new values that were set on create. // Using this option is equivalent to using: // @@ -401,20 +389,6 @@ func (u *TaskUpsertOne) ClearPriorities() *TaskUpsertOne { }) } -// SetCreatedAt sets the "created_at" field. -func (u *TaskUpsertOne) SetCreatedAt(v time.Time) *TaskUpsertOne { - return u.Update(func(s *TaskUpsert) { - s.SetCreatedAt(v) - }) -} - -// UpdateCreatedAt sets the "created_at" field to the value that was provided on create. -func (u *TaskUpsertOne) UpdateCreatedAt() *TaskUpsertOne { - return u.Update(func(s *TaskUpsert) { - s.UpdateCreatedAt() - }) -} - // Exec executes the query. func (u *TaskUpsertOne) Exec(ctx context.Context) error { if len(u.create.conflict) == 0 { @@ -664,20 +638,6 @@ func (u *TaskUpsertBulk) ClearPriorities() *TaskUpsertBulk { }) } -// SetCreatedAt sets the "created_at" field. -func (u *TaskUpsertBulk) SetCreatedAt(v time.Time) *TaskUpsertBulk { - return u.Update(func(s *TaskUpsert) { - s.SetCreatedAt(v) - }) -} - -// UpdateCreatedAt sets the "created_at" field to the value that was provided on create. -func (u *TaskUpsertBulk) UpdateCreatedAt() *TaskUpsertBulk { - return u.Update(func(s *TaskUpsert) { - s.UpdateCreatedAt() - }) -} - // Exec executes the query. func (u *TaskUpsertBulk) Exec(ctx context.Context) error { for i, b := range u.create.builders {