From eeb4645da4ca7c219720bea3320497a90980eff5 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sat, 24 Oct 2020 20:20:30 +0200 Subject: [PATCH] fix all go-pg depreaction warnings --- models/player_history.go | 2 +- models/player_name_change.go | 2 +- models/player_to_server.go | 2 +- models/special_server.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/player_history.go b/models/player_history.go index 9e787e4..8924715 100644 --- a/models/player_history.go +++ b/models/player_history.go @@ -13,7 +13,7 @@ type PlayerHistory struct { Points int `json:"points" pg:",use_zero" gqlgen:"points" xml:"points"` Rank int `json:"rank" pg:",use_zero" gqlgen:"rank" xml:"rank"` TribeID int `json:"-" pg:",use_zero" gqlgen:"tribeID" xml:"tribeID"` - Tribe *Tribe `json:"tribe,omitempty" gqlgen:"-" xml:"tribe"` + Tribe *Tribe `json:"tribe,omitempty" gqlgen:"-" xml:"tribe" pg:"rel:has-one"` CreateDate time.Time `pg:"default:CURRENT_DATE,type:DATE,unique:group_1,use_zero" json:"createDate" gqlgen:"createDate" xml:"createDate"` } diff --git a/models/player_name_change.go b/models/player_name_change.go index 516ad7a..a93290e 100644 --- a/models/player_name_change.go +++ b/models/player_name_change.go @@ -4,7 +4,7 @@ import "time" type PlayerNameChange struct { LangVersionTag LanguageTag `pg:",unique:group_1" json:"langVersionTag" gqlgen:"langVersionTag" xml:"langVersionTag"` - LangVersion *LangVersion `pg:"fk:lang_version_tag" json:"langVersion" gqlgen:"langVersion" xml:"langVersion" pg:"rel:has-one"` + LangVersion *LangVersion `pg:"fk:lang_version_tag,rel:has-one" json:"langVersion" gqlgen:"langVersion" xml:"langVersion"` PlayerID int `pg:",unique:group_1" json:"playerID" gqlgen:"playerID" xml:"playerID"` OldName string `pg:",unique:group_1" json:"oldName" gqlgen:"oldName" xml:"oldName"` NewName string `pg:",unique:group_1" json:"newName" gqlgen:"newName" xml:"newName"` diff --git a/models/player_to_server.go b/models/player_to_server.go index ba1809d..5675a47 100644 --- a/models/player_to_server.go +++ b/models/player_to_server.go @@ -2,6 +2,6 @@ package models type PlayerToServer struct { ServerKey string `pg:",unique:group_1" json:"serverKey" gqlgen:"serverKey" xml:"serverKey"` - Server *Server `pg:"fk:server_key" json:"server" gqlgen:"server" xml:"server" pg:"rel:has-one"` + Server *Server `pg:"fk:server_key,rel:has-one" json:"server" gqlgen:"server" xml:"server"` PlayerID int `pg:",unique:group_1" json:"playerID" gqlgen:"playerID" xml:"playerID"` } diff --git a/models/special_server.go b/models/special_server.go index b777be3..f0cd714 100644 --- a/models/special_server.go +++ b/models/special_server.go @@ -4,7 +4,7 @@ type SpecialServer struct { tableName struct{} `pg:"special_servers,alias:special_server"` LangVersionTag LanguageTag `pg:",unique:group_1" json:"langVersionTag" gqlgen:"langVersionTag" xml:"langVersionTag"` - LangVersion *LangVersion `pg:"fk:lang_version_tag" json:"omitempty,langVersion" gqlgen:"-" xml:"langVersion" pg:"rel:has-one"` + LangVersion *LangVersion `pg:"fk:lang_version_tag,rel:has-one" json:"omitempty,langVersion" gqlgen:"-" xml:"langVersion"` Key string `pg:",unique:group_1" json:"key" gqlgen:"key" xml:"key"` }