fix: use new pagination template

suyuan32 · Apr 29, 2024 · 3e234e2 · 3e234e2
1 parent 5042871
commit 3e234e2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/ent/pagination.go b/ent/pagination.go
diff --git a/ent/template/pagination.tmpl b/ent/template/pagination.tmpl
@@ -1,3 +1,9 @@
+{{/*
+Copyright 2022-present Ryan SU (github.com/suyuan32). All rights reserved.
+This source code is licensed under the Apache 2.0 license found
+in the LICENSE file in the root directory of this source tree.
+*/}}
+
 {{ define "pagination" }}
     {{- /*gotype: entgo.io/ent/entc/gen.Graph*/ -}}
 
@@ -134,7 +140,9 @@
                 Size: pageSize,
             }
 
-            count, err := {{ $r }}.Clone().Count(ctx)
+            query := {{ $r }}.Clone()
+            query.ctx.Fields = nil
+            count, err := query.Count(ctx)
 
             if err != nil {
                 return nil, err

diff --git a/ent/template/set_not_nil.tmpl b/ent/template/set_not_nil.tmpl
@@ -1,3 +1,9 @@
+{{/*
+Copyright 2022-present Ryan SU (github.com/suyuan32). All rights reserved.
+This source code is licensed under the Apache 2.0 license found
+in the LICENSE file in the root directory of this source tree.
+*/}}
+
 {{/* gotype: entgo.io/ent/entc/gen.Graph */}}
 
 
@@ -14,9 +20,9 @@
 
             {{ range $updater := list $n.UpdateName $n.UpdateOneName $n.CreateName}}
                 // set field if value's pointer is not nil.
-                func ({{ $n.Receiver }} *{{ $updater }}) SetNotNil{{ $f.StructField }}(value *{{ $f.Type }}) *{{ $updater }} {
+                func ({{ $n.Receiver }} *{{ $updater }}) SetNotNil{{ $f.StructField }}(value {{if not (hasPrefix $f.Type.String "[]") }}*{{end}}{{ $f.Type }}) *{{ $updater }} {
                 if value != nil  {
-                return {{ $n.Receiver }}.{{ $set }}(*value)
+                return {{ $n.Receiver }}.{{ $set }}({{if not (hasPrefix $f.Type.String "[]") }}*{{end}}value)
                 }
                 return {{ $n.Receiver }}
                 }