entgql: improve var name collision avoidance in toCursor (#572)

Improves variable name collision avoidance in the `toCursor` method of the pager types in the `gql_pagination` template by suffixing all hard-coded variables names with an underscore.
ent · Apr 11, 2024 · 4ec1976 · 4ec1976
1 parent 439e519
commit 4ec1976
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 48 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
@@ -271,12 +271,12 @@ func (p *{{ $pager }}) applyFilter(query *{{ $query }}) (*{{ $query }}, error) {
 {{ $r := $node.Receiver }}
 func (p *{{ $pager }}) toCursor({{ $r }} *{{ $name }}) Cursor {
 	{{- if $multiOrder }}
-		cs := make([]any, 0, len(p.order))
-		for _, po := range p.order {
-			cs = append(cs, po.Field.toCursor({{ $r }}).Value)
+		cs_ := make([]any, 0, len(p.order))
+		for _, o_ := range p.order {
+			cs_ = append(cs_, o_.Field.toCursor({{ $r }}).Value)
 		}
 		{{- $marshalID := and $idType.Mixed (gqlMarshaler $node.ID) }}
-		return Cursor{ID: {{ $r }}.{{ if $marshalID }}marshalID(){{ else }}ID{{ end }}, Value: cs}
+		return Cursor{ID: {{ $r }}.{{ if $marshalID }}marshalID(){{ else }}ID{{ end }}, Value: cs_}
 	{{- else }}
 		return p.order.Field.toCursor({{ $r }})
 	{{- end }}