From cc747749501a51be742d1d6724c5ec1ebf081fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Mon, 15 Feb 2021 17:15:59 +0100 Subject: [PATCH] Use uuid.Nil instead of uuid.New() in ent schema initializers It is used just to carry the sql.Scanner and sql.Valuer interface. --- pkg/model/ent/schema/answer.go | 5 ++--- pkg/model/ent/schema/askedQuestion.go | 2 +- pkg/model/ent/schema/choice.go | 5 ++--- pkg/model/ent/schema/game.go | 2 +- pkg/model/ent/schema/player.go | 2 +- pkg/model/ent/schema/question.go | 2 +- pkg/model/ent/schema/session.go | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkg/model/ent/schema/answer.go b/pkg/model/ent/schema/answer.go index c90e113..f46d38d 100644 --- a/pkg/model/ent/schema/answer.go +++ b/pkg/model/ent/schema/answer.go @@ -13,14 +13,13 @@ type Answer struct { func (Answer) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable().Unique(), + field.UUID("id", uuid.Nil).Immutable().Unique(), field.Time("answered").Immutable(), } } func (Answer) Indexes() []ent.Index { - return []ent.Index{ - } + return []ent.Index{} } func (Answer) Edges() []ent.Edge { diff --git a/pkg/model/ent/schema/askedQuestion.go b/pkg/model/ent/schema/askedQuestion.go index fd235e1..d4cb379 100644 --- a/pkg/model/ent/schema/askedQuestion.go +++ b/pkg/model/ent/schema/askedQuestion.go @@ -13,7 +13,7 @@ type AskedQuestion struct { func (AskedQuestion) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable(), + field.UUID("id", uuid.Nil).Immutable(), field.Time("asked").Immutable(), field.Time("ended"), } diff --git a/pkg/model/ent/schema/choice.go b/pkg/model/ent/schema/choice.go index e24b5ce..2d07735 100644 --- a/pkg/model/ent/schema/choice.go +++ b/pkg/model/ent/schema/choice.go @@ -13,15 +13,14 @@ type Choice struct { func (Choice) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable(), + field.UUID("id", uuid.Nil).Immutable(), field.Text("title").MinLen(1).MaxLen(256), field.Bool("correct"), } } func (Choice) Indexes() []ent.Index { - return []ent.Index{ - } + return []ent.Index{} } func (Choice) Edges() []ent.Edge { diff --git a/pkg/model/ent/schema/game.go b/pkg/model/ent/schema/game.go index 9bceda0..1417bb1 100644 --- a/pkg/model/ent/schema/game.go +++ b/pkg/model/ent/schema/game.go @@ -13,7 +13,7 @@ type Game struct { func (Game) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Unique().Immutable(), + field.UUID("id", uuid.Nil).Unique().Immutable(), field.Text("name").MaxLen(64), field.Time("created").Immutable(), field.Text("author").MaxLen(64), diff --git a/pkg/model/ent/schema/player.go b/pkg/model/ent/schema/player.go index 38ef994..99df50d 100644 --- a/pkg/model/ent/schema/player.go +++ b/pkg/model/ent/schema/player.go @@ -15,7 +15,7 @@ type Player struct { func (Player) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable(), + field.UUID("id", uuid.Nil).Immutable(), field.Text("name").MaxLen(64).MinLen(1).Match(regexp.MustCompile("(?:[a-z]|[A-Z]|_|-|.|,|[0-9])+")), field.Time("joined").Immutable(), field.Bool("organiser").Default(false), diff --git a/pkg/model/ent/schema/question.go b/pkg/model/ent/schema/question.go index a072f23..139e5b6 100644 --- a/pkg/model/ent/schema/question.go +++ b/pkg/model/ent/schema/question.go @@ -14,7 +14,7 @@ type Question struct { func (Question) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable(), + field.UUID("id", uuid.Nil).Immutable(), field.Text("title").MaxLen(256).MinLen(1), field.Int("order"), field.Uint64("defaultLength"), // in milliseconds diff --git a/pkg/model/ent/schema/session.go b/pkg/model/ent/schema/session.go index 75a8e9b..4bffc61 100644 --- a/pkg/model/ent/schema/session.go +++ b/pkg/model/ent/schema/session.go @@ -13,7 +13,7 @@ type Session struct { func (Session) Fields() []ent.Field { return []ent.Field{ - field.UUID("id", uuid.New()).Immutable(), + field.UUID("id", uuid.Nil).Immutable(), field.Time("created").Immutable(), field.Time("started").Nillable().Optional(), // TODO remove? field.String("code").MinLen(6).MaxLen(6).Immutable().Unique(),