Skip to content

Commit 225c489

Browse files
kolaentetechknowlogick
authored andcommitted
Fixed heatmap not working in mssql (#5248)
1 parent fa16562 commit 225c489

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

models/user_heatmap.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ type UserHeatmapData struct {
1919
func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
2020
hdata := make([]*UserHeatmapData, 0)
2121
var groupBy string
22+
var groupByName = "timestamp" // We need this extra case because mssql doesn't allow grouping by alias
2223
switch {
2324
case setting.UseSQLite3:
2425
groupBy = "strftime('%s', strftime('%Y-%m-%d', created_unix, 'unixepoch'))"
@@ -28,13 +29,14 @@ func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
2829
groupBy = "extract(epoch from date_trunc('day', to_timestamp(created_unix)))"
2930
case setting.UseMSSQL:
3031
groupBy = "dateadd(DAY,0, datediff(day,0, dateadd(s, created_unix, '19700101')))"
32+
groupByName = groupBy
3133
}
3234

33-
err := x.Select(groupBy+" as timestamp, count(user_id) as contributions").
35+
err := x.Select(groupBy+" AS timestamp, count(user_id) as contributions").
3436
Table("action").
3537
Where("user_id = ?", user.ID).
3638
And("created_unix > ?", (util.TimeStampNow() - 31536000)).
37-
GroupBy("timestamp").
39+
GroupBy(groupByName).
3840
OrderBy("timestamp").
3941
Find(&hdata)
4042
return hdata, err

0 commit comments

Comments
 (0)