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

entc/gen: check runtime import before executing privacy rules (#1054)

Browse Source
This commit is contained in:
Ariel Mashraki
2020-12-17 18:36:46 +02:00
committed by GitHub
parent 754e89c6ae
commit 3daea98d76
9 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
entc/gen/internal/bindata.go
View File

File diff suppressed because one or more lines are too long

3
entc/gen/template/builder/query.tmpl
View File

@@ -355,6 +355,9 @@ func ({{ $receiver }} *{{ $builder }}) prepareQuery(ctx context.Context) error {
{{ $receiver }}.{{ $.Storage }} = prev
}
{{- if $.NumPolicy }}
if {{ $.Package }}.Policy == nil {
return errors.New("{{ $pkg }}: uninitialized {{ $.Package }}.Policy (forgotten import {{ $pkg }}/runtime?)")
}
if err := {{ $.Package }}.Policy.EvalQuery(ctx, {{ $receiver }}); err != nil {
return err
}

3
entc/integration/privacy/ent/task_query.go
View File

@@ -370,6 +370,9 @@ func (tq *TaskQuery) prepareQuery(ctx context.Context) error {
}
tq.sql = prev
}
if task.Policy == nil {
return errors.New("ent: uninitialized task.Policy (forgotten import ent/runtime?)")
}
if err := task.Policy.EvalQuery(ctx, tq); err != nil {
return err
}

3
entc/integration/privacy/ent/team_query.go
View File

@@ -369,6 +369,9 @@ func (tq *TeamQuery) prepareQuery(ctx context.Context) error {
}
tq.sql = prev
}
if team.Policy == nil {
return errors.New("ent: uninitialized team.Policy (forgotten import ent/runtime?)")
}
if err := team.Policy.EvalQuery(ctx, tq); err != nil {
return err
}

3
entc/integration/privacy/ent/user_query.go
View File

@@ -369,6 +369,9 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error {
}
uq.sql = prev
}
if user.Policy == nil {
return errors.New("ent: uninitialized user.Policy (forgotten import ent/runtime?)")
}
if err := user.Policy.EvalQuery(ctx, uq); err != nil {
return err
}

3
examples/privacyadmin/ent/user_query.go
View File

@@ -295,6 +295,9 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error {
}
uq.sql = prev
}
if user.Policy == nil {
return errors.New("ent: uninitialized user.Policy (forgotten import ent/runtime?)")
}
if err := user.Policy.EvalQuery(ctx, uq); err != nil {
return err
}

3
examples/privacytenant/ent/group_query.go
View File

@@ -370,6 +370,9 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error {
}
gq.sql = prev
}
if group.Policy == nil {
return errors.New("ent: uninitialized group.Policy (forgotten import ent/runtime?)")
}
if err := group.Policy.EvalQuery(ctx, gq); err != nil {
return err
}

3
examples/privacytenant/ent/tenant_query.go
View File

@@ -295,6 +295,9 @@ func (tq *TenantQuery) prepareQuery(ctx context.Context) error {
}
tq.sql = prev
}
if tenant.Policy == nil {
return errors.New("ent: uninitialized tenant.Policy (forgotten import ent/runtime?)")
}
if err := tenant.Policy.EvalQuery(ctx, tq); err != nil {
return err
}

3
examples/privacytenant/ent/user_query.go
View File

@@ -370,6 +370,9 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error {
}
uq.sql = prev
}
if user.Policy == nil {
return errors.New("ent: uninitialized user.Policy (forgotten import ent/runtime?)")
}
if err := user.Policy.EvalQuery(ctx, uq); err != nil {
return err
}