entc/gen: fix name clash in entc template when entity name has initia…

…ls as tx (#2633)
ent · Jun 9, 2022 · e615285 · e615285
1 parent fd95565
commit e615285
Show file tree

Hide file tree

Showing 115 changed files with 231 additions and 231 deletions.
diff --git a/entc/gen/template/ent.tmpl b/entc/gen/template/ent.tmpl
@@ -111,11 +111,11 @@ func ({{ $receiver }} *{{ $.Name }}) Update() *{{ $.UpdateOneName }} {
 // Unwrap unwraps the {{ $.Name }} entity that was returned from a transaction after it was closed,
 // so that all future queries will be executed through the driver which created the transaction.
 func ({{ $receiver }} *{{ $.Name }}) Unwrap() *{{ $.Name }} {
-	tx, ok := {{ $receiver }}.config.driver.(*txDriver)
+	_tx, ok := {{ $receiver }}.config.driver.(*txDriver)
 	if !ok {
 		panic("{{ $pkg }}: {{ $.Name }} is not a transactional entity")
 	}
-	{{ $receiver }}.config.driver = tx.drv
+	{{ $receiver }}.config.driver = _tx.drv
 	return {{ $receiver }}
 }
 
@@ -243,4 +243,4 @@ func ({{ $receiver }} {{ $slice }}) config(cfg config) {
 			{{- xtemplate $tmpl $ }}
 		{{- end }}
 	{{- end }}
-{{ end }}
+{{ end }}
diff --git a/entc/integration/cascadelete/ent/comment.go b/entc/integration/cascadelete/ent/comment.go
diff --git a/entc/integration/cascadelete/ent/post.go b/entc/integration/cascadelete/ent/post.go
diff --git a/entc/integration/cascadelete/ent/user.go b/entc/integration/cascadelete/ent/user.go
diff --git a/entc/integration/config/ent/user.go b/entc/integration/config/ent/user.go
diff --git a/entc/integration/customid/ent/account.go b/entc/integration/customid/ent/account.go
diff --git a/entc/integration/customid/ent/blob.go b/entc/integration/customid/ent/blob.go
diff --git a/entc/integration/customid/ent/car.go b/entc/integration/customid/ent/car.go
diff --git a/entc/integration/customid/ent/device.go b/entc/integration/customid/ent/device.go
diff --git a/entc/integration/customid/ent/doc.go b/entc/integration/customid/ent/doc.go
diff --git a/entc/integration/customid/ent/group.go b/entc/integration/customid/ent/group.go
diff --git a/entc/integration/customid/ent/mixinid.go b/entc/integration/customid/ent/mixinid.go
diff --git a/entc/integration/customid/ent/note.go b/entc/integration/customid/ent/note.go
diff --git a/entc/integration/customid/ent/other.go b/entc/integration/customid/ent/other.go
diff --git a/entc/integration/customid/ent/pet.go b/entc/integration/customid/ent/pet.go
diff --git a/entc/integration/customid/ent/revision.go b/entc/integration/customid/ent/revision.go
diff --git a/entc/integration/customid/ent/session.go b/entc/integration/customid/ent/session.go
diff --git a/entc/integration/customid/ent/token.go b/entc/integration/customid/ent/token.go
diff --git a/entc/integration/customid/ent/user.go b/entc/integration/customid/ent/user.go
diff --git a/entc/integration/edgefield/ent/car.go b/entc/integration/edgefield/ent/car.go
diff --git a/entc/integration/edgefield/ent/card.go b/entc/integration/edgefield/ent/card.go
diff --git a/entc/integration/edgefield/ent/info.go b/entc/integration/edgefield/ent/info.go
diff --git a/entc/integration/edgefield/ent/metadata.go b/entc/integration/edgefield/ent/metadata.go
diff --git a/entc/integration/edgefield/ent/node.go b/entc/integration/edgefield/ent/node.go
diff --git a/entc/integration/edgefield/ent/pet.go b/entc/integration/edgefield/ent/pet.go
diff --git a/entc/integration/edgefield/ent/post.go b/entc/integration/edgefield/ent/post.go
diff --git a/entc/integration/edgefield/ent/rental.go b/entc/integration/edgefield/ent/rental.go
diff --git a/entc/integration/edgefield/ent/user.go b/entc/integration/edgefield/ent/user.go