From 3abb2726d0f6e5c9cb61998da711820b2e34f396 Mon Sep 17 00:00:00 2001 From: Steven Imle Date: Thu, 5 Nov 2020 11:26:43 -0500 Subject: [PATCH] entc/gen: ensure edges are able to use Go keywords as storage-keys (#922) --- entc/gen/type.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entc/gen/type.go b/entc/gen/type.go index d472d97b0..2601f21f2 100644 --- a/entc/gen/type.go +++ b/entc/gen/type.go @@ -545,7 +545,7 @@ func (t *Type) resolveFKs() error { fk := &ForeignKey{ Edge: e, Field: &Field{ - Name: e.Rel.Column(), + Name: builderField(e.Rel.Column()), Type: refid.Type, Nillable: true, Optional: true, @@ -1130,7 +1130,7 @@ func (e Edge) StructField() string { // StructFKField returns the struct member for holding the edge // foreign-key in the model. func (e Edge) StructFKField() string { - return e.Rel.Column() + return builderField(e.Rel.Column()) } // OwnFK indicates if the foreign-key of this edge is owned by the edge