From a5b47310d134d7d027712f7c83f778e05c91d695 Mon Sep 17 00:00:00 2001 From: wish Date: Tue, 4 Oct 2022 20:23:13 +1100 Subject: [PATCH] clean up guild queries --- server/channelserver/handlers_guild.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index 53df91adb..8891f23ee 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -164,7 +164,7 @@ func (guild *Guild) Save(s *Session) error { func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType GuildApplicationType, transaction *sql.Tx) error { - sql := ` + query := ` INSERT INTO guild_applications (guild_id, character_id, actor_id, application_type) VALUES ($1, $2, $3, $4) ` @@ -172,9 +172,9 @@ func (guild *Guild) CreateApplication(s *Session, charID uint32, applicationType var err error if transaction == nil { - _, err = s.server.db.Exec(sql, guild.ID, charID, s.charID, applicationType) + _, err = s.server.db.Exec(query, guild.ID, charID, s.charID, applicationType) } else { - _, err = transaction.Exec(sql, guild.ID, charID, s.charID, applicationType) + _, err = transaction.Exec(query, guild.ID, charID, s.charID, applicationType) } if err != nil { @@ -222,7 +222,7 @@ func (guild *Guild) Disband(s *Session) error { return err } - _, err = transaction.Exec("UPDATE guild_alliances SET sub1_id=NULL WHERE sub1_id=$1", guild.ID) + _, err = transaction.Exec("UPDATE guild_alliances SET sub1_id=sub2_id, sub2_id=NULL WHERE sub1_id=$1", guild.ID) if err != nil { s.logger.Error("failed to remove guild from alliance", zap.Error(err), zap.Uint32("guildID", guild.ID))