Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

entc/gen: expose config on generated filters #2473

Merged
merged 1 commit into from Apr 14, 2022
Merged

entc/gen: expose config on generated filters #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions entc/gen/template/dialect/sql/entql.tmpl
View file
Open in desktop
Expand Up @@ -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 }} }
return &{{ $filter }}{ {{ $receiver }}.config, {{ $receiver}} }
}

// addPredicate implements the predicateAdder interface.
Expand All @@ -92,11 +92,12 @@ type predicateAdder interface {

// Filter returns an entql.Where implementation to apply filters on the {{ $mutation }} builder.
func (m *{{ $mutation }}) Filter() *{{ $filter }} {
return &{{ $filter }}{m}
return &{{ $filter }}{m.config, m}
}

// {{ $filter }} provides a generic filtering capability at runtime for {{ $builder }}.
type {{ $filter }} struct {
config
predicateAdder
}

Expand Down
65 changes: 39 additions & 26 deletions entc/integration/customid/ent/entql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.