1
0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00

fix: replace mysql backticks

This commit is contained in:
Ferdinand Mütsch 2022-10-06 15:23:59 +02:00
parent 5609c0ada3
commit dec5849661

View File

@ -37,9 +37,9 @@ func (r *LeaderboardRepository) GetAllAggregatedByInterval(key *models.IntervalK
// TODO: distinct by (user, key) to filter out potential duplicates ? // TODO: distinct by (user, key) to filter out potential duplicates ?
var items []*models.LeaderboardItem var items []*models.LeaderboardItem
q := r.db. q := r.db.
Select("*, rank() over (partition by `key` order by total desc) as `rank`"). Select("*, rank() over (partition by \"key\" order by total desc) as \"rank\"").
Where("`interval` in ?", *key) Where("\"interval\" in ?", *key)
q = utils.WhereNullable(q, "`by`", by) q = utils.WhereNullable(q, "\"by\"", by)
if err := q.Find(&items).Error; err != nil { if err := q.Find(&items).Error; err != nil {
return nil, err return nil, err
@ -50,10 +50,10 @@ func (r *LeaderboardRepository) GetAllAggregatedByInterval(key *models.IntervalK
func (r *LeaderboardRepository) GetAggregatedByUserAndInterval(userId string, key *models.IntervalKey, by *uint8) ([]*models.LeaderboardItem, error) { func (r *LeaderboardRepository) GetAggregatedByUserAndInterval(userId string, key *models.IntervalKey, by *uint8) ([]*models.LeaderboardItem, error) {
var items []*models.LeaderboardItem var items []*models.LeaderboardItem
q := r.db. q := r.db.
Select("*, rank() over (partition by `key` order by total desc) as `rank`"). Select("*, rank() over (partition by \"key\" order by total desc) as \"rank\"").
Where("user_id = ?", userId). Where("user_id = ?", userId).
Where("`interval` in ?", *key) Where("\"interval\" in ?", *key)
q = utils.WhereNullable(q, "`by`", by) q = utils.WhereNullable(q, "\"by\"", by)
if err := q.Find(&items).Error; err != nil { if err := q.Find(&items).Error; err != nil {
return nil, err return nil, err
@ -73,7 +73,7 @@ func (r *LeaderboardRepository) DeleteByUser(userId string) error {
func (r *LeaderboardRepository) DeleteByUserAndInterval(userId string, key *models.IntervalKey) error { func (r *LeaderboardRepository) DeleteByUserAndInterval(userId string, key *models.IntervalKey) error {
if err := r.db. if err := r.db.
Where("user_id = ?", userId). Where("user_id = ?", userId).
Where("`interval` in ?", *key). Where("\"interval\" in ?", *key).
Delete(models.LeaderboardItem{}).Error; err != nil { Delete(models.LeaderboardItem{}).Error; err != nil {
return err return err
} }