mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ferdinand Mütsch 2023-07-28 12:08:54 +02:00
commit a9364e3d9e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migrations/20221028_fix_heartbeats_time_user_idx.go
View File

@ -1,12 +1,13 @@
package migrations package migrations
import ( import (
"regexp"
"strings"
"github.com/emvi/logbuch" "github.com/emvi/logbuch"
"github.com/muety/wakapi/config" "github.com/muety/wakapi/config"
"github.com/muety/wakapi/models" "github.com/muety/wakapi/models"
"gorm.io/gorm" "gorm.io/gorm"
"regexp"
"strings"
) )
// due to an error in the model definition, idx_time_user used to only cover 'user_id', but not time column // due to an error in the model definition, idx_time_user used to only cover 'user_id', but not time column
@ -37,7 +38,7 @@ func init() {
} }
matches := regexp.MustCompile("(?i)\\((.+)\\)$").FindStringSubmatch(ddl) matches := regexp.MustCompile("(?i)\\((.+)\\)$").FindStringSubmatch(ddl)
if len(matches) > 0 && !strings.Contains(matches[0], "`user_id`") || !strings.Contains(matches[0], "`time`") { if len(matches) > 0 && (!strings.Contains(matches[0], "`user_id`") || !strings.Contains(matches[0], "`time`")) {
drop = true drop = true
} }
} else { } else {