entgql: avoid naming conflicts in toCursor template (#538)

* fix: rename variable when iterating through p.order to prevent conflict with $r that starts with "O" character * fix: run go generate on entgql
ent · Jul 25, 2023 · 9e1dadf · 9e1dadf
1 parent 02db1ac
commit 9e1dadf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/entgql/internal/todo/ent/gql_pagination.go b/entgql/internal/todo/ent/gql_pagination.go
diff --git a/entgql/internal/todogotype/ent/gql_pagination.go b/entgql/internal/todogotype/ent/gql_pagination.go
diff --git a/entgql/internal/todopulid/ent/gql_pagination.go b/entgql/internal/todopulid/ent/gql_pagination.go
diff --git a/entgql/internal/todouuid/ent/gql_pagination.go b/entgql/internal/todouuid/ent/gql_pagination.go
diff --git a/entgql/template/pagination.tmpl b/entgql/template/pagination.tmpl
@@ -272,8 +272,8 @@ func (p *{{ $pager }}) applyFilter(query *{{ $query }}) (*{{ $query }}, error) {
 func (p *{{ $pager }}) toCursor({{ $r }} *{{ $name }}) Cursor {
 	{{- if $multiOrder }}
 		cs := make([]any, 0, len(p.order))
-		for _, o := range p.order {
-			cs = append(cs, o.Field.toCursor({{ $r }}).Value)
+		for _, po := range p.order {
+			cs = append(cs, po.Field.toCursor({{ $r }}).Value)
 		}
 		{{- $marshalID := and $idType.Mixed (gqlMarshaler $node.ID) }}
 		return Cursor{ID: {{ $r }}.{{ if $marshalID }}marshalID(){{ else }}ID{{ end }}, Value: cs}