fix typo, add a new constant - serverPGDefaulValues

This commit is contained in:
Dawid Wysokiński 2020-07-15 10:19:11 +02:00 committed by Kichiyaki
parent 5c069c919f
commit 237f870abc
4 changed files with 30 additions and 6 deletions

View File

@ -79,6 +79,14 @@ func (h *handler) init() error {
}
}
for _, statement := range []string{
pgDefaultValues,
} {
if _, err := tx.Exec(statement); err != nil {
return err
}
}
return tx.Commit()
}
@ -118,6 +126,7 @@ func (h *handler) createSchema(server *models.Server) error {
for _, statement := range []string{
serverPGFunctions,
serverPGTriggers,
serverPGDefaultValues,
} {
if _, err := tx.Exec(statement, pg.Safe(server.Key), server.LangVersionTag); err != nil {
return err

View File

@ -241,4 +241,16 @@ const (
FOR EACH ROW
EXECUTE PROCEDURE check_most_points_most_villages_best_rank_values();
`
serverPGDefaultValues = `
ALTER TABLE ?0.daily_player_stats ALTER COLUMN create_date set default CURRENT_DATE;
ALTER TABLE ?0.daily_tribe_stats ALTER COLUMN create_date set default CURRENT_DATE;
ALTER TABLE ?0.player_history ALTER COLUMN create_date set default CURRENT_DATE;
ALTER TABLE ?0.tribe_history ALTER COLUMN create_date set default CURRENT_DATE;
ALTER TABLE ?0.stats ALTER COLUMN create_date set default CURRENT_DATE;
`
pgDefaultValues = `
ALTER TABLE player_name_changes ALTER COLUMN change_date set default CURRENT_DATE;
`
)

View File

@ -19,6 +19,7 @@ func (h *updateServerHistoryHandler) update() error {
return errors.Wrap(err, "cannot load players")
}
createDate := time.Now()
ph := []*models.PlayerHistory{}
for _, player := range players {
ph = append(ph, &models.PlayerHistory{
@ -28,6 +29,7 @@ func (h *updateServerHistoryHandler) update() error {
Points: player.Points,
Rank: player.Rank,
TribeID: player.TribeID,
CreateDate: createDate,
})
}
@ -46,6 +48,7 @@ func (h *updateServerHistoryHandler) update() error {
AllPoints: tribe.AllPoints,
Rank: tribe.Rank,
Dominance: tribe.Dominance,
CreateDate: createDate,
})
}

View File

@ -19,11 +19,11 @@ func (h *vacuumServerDBHandler) vacuum() error {
}
defer tx.Close()
withNotExitedPlayers := h.db.Model(&models.Player{}).Where("exists = false")
withNotExitedTribes := h.db.Model(&models.Tribe{}).Where("exists = false")
withNotExistedPlayers := h.db.Model(&models.Player{}).Where("exists = false")
withNotExistedTribes := h.db.Model(&models.Tribe{}).Where("exists = false")
_, err = tx.Model(&models.PlayerHistory{}).
With("players", withNotExitedPlayers).
With("players", withNotExistedPlayers).
Where("player_id IN (Select id FROM players) OR player_history.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
Delete()
if err != nil {
@ -31,7 +31,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
}
_, err = tx.Model(&models.TribeHistory{}).
With("tribes", withNotExitedTribes).
With("tribes", withNotExistedTribes).
Where("tribe_id IN (Select id FROM tribes) OR tribe_history.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
Delete()
if err != nil {
@ -39,7 +39,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
}
_, err = tx.Model(&models.DailyPlayerStats{}).
With("players", withNotExitedPlayers).
With("players", withNotExistedPlayers).
Where("player_id IN (Select id FROM players) OR daily_player_stats.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
Delete()
if err != nil {
@ -47,7 +47,7 @@ func (h *vacuumServerDBHandler) vacuum() error {
}
_, err = tx.Model(&models.DailyTribeStats{}).
With("tribes", withNotExitedTribes).
With("tribes", withNotExistedTribes).
Where("tribe_id IN (Select id FROM tribes) OR daily_tribe_stats.create_date < ?", time.Now().Add(-1*24*time.Hour*90)).
Delete()
if err != nil {