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: fixed unnamed field initialization (#2648)

Browse Source 
* entc/gen: fixed ConstraintError fields name

* fix: run go generate

* entc/gen: fixed Filter fields name

* fix: run go generate again for entql
This commit is contained in:
Giau. Tran Minh
2022-06-14 16:32:46 +07:00
committed by GitHub
parent cd1afb235c
commit 195be2d98d
209 changed files with 512 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name
_node, _spec := {{ $receiver }}.createSpec()
if err := sqlgraph.CreateNode(ctx, {{ $receiver }}.driver, _spec); err != nil {
if sqlgraph.IsConstraintError(err) {
err = &ConstraintError{err.Error(), err}
err = &ConstraintError{msg: err.Error(), wrap: err}
}
return nil, err
}
@@ -170,7 +170,7 @@ func ({{ $receiver }} *{{ $builder }}) Save(ctx context.Context) ([]*{{ $.Name }
// Invoke the actual operation on the latest mutation in the chain.
if err = sqlgraph.BatchCreate(ctx, {{ $receiver }}.driver, spec); err != nil {
if sqlgraph.IsConstraintError(err) {
err = &ConstraintError{err.Error(), err}
err = &ConstraintError{msg: err.Error(), wrap: err}
}
}
}

6
entc/gen/template/dialect/sql/entql.tmpl
View File

@@ -82,7 +82,7 @@ type predicateAdder interface {
// Filter returns a Filter implementation to apply filters on the {{ $builder }} builder.
func ({{ $receiver }} *{{ $builder }}) Filter() *{{ $filter }} {
return &{{ $filter }}{ {{ $receiver }}.config, {{ $receiver}} }
return &{{ $filter }}{config: {{ $receiver }}.config, predicateAdder: {{ $receiver}} }
}
// addPredicate implements the predicateAdder interface.
@@ -92,13 +92,13 @@ type predicateAdder interface {
// Filter returns an entql.Where implementation to apply filters on the {{ $mutation }} builder.
func (m *{{ $mutation }}) Filter() *{{ $filter }} {
return &{{ $filter }}{m.config, m}
return &{{ $filter }}{config: m.config, predicateAdder: m}
}
// {{ $filter }} provides a generic filtering capability at runtime for {{ $builder }}.
type {{ $filter }} struct {
config
predicateAdder
config
}
// Where applies the entql predicate on the query filter.

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

@@ -135,7 +135,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
if _, ok := err.(*sqlgraph.NotFoundError); ok {
err = &NotFoundError{ {{ $.Package }}.Label}
} else if sqlgraph.IsConstraintError(err) {
err = &ConstraintError{err.Error(), err}
err = &ConstraintError{msg: err.Error(), wrap: err}
}
return {{ $zero }}, err
}