Merge pull request #923 from gotify/sort-key-fixes

jmattheis · web-flow · commit 413f081b26a6 · 2026-02-28T17:08:08.000+01:00
Sort key fixes
diff --git a/database/database.go b/database/database.go
@@ -111,7 +111,7 @@ func fillMissingSortKeys(db *gorm.DB) error {
 	if err := db.Order("user_id, sort_key, id ASC").Find(&apps).Error; err != nil && err != gorm.ErrRecordNotFound {
 		return err
 	}
-	fmt.Println("Migrating", len(apps), "application sort keys for")
+	fmt.Println("Migrating", len(apps), "application sort keys")
 
 	sortKey := ""
 	currentUser := uint(math.MaxUint)
diff --git a/model/application.go b/model/application.go
@@ -58,5 +58,5 @@ type Application struct {
 	//
 	// required: true
 	// example: a1
-	SortKey string `gorm:"uniqueIndex:uix_application_user_id_sort_key,priority:2" form:"sortKey" query:"sortKey" json:"sortKey"`
+	SortKey string `gorm:"type:bytes;uniqueIndex:uix_application_user_id_sort_key,priority:2,length:255" form:"sortKey" query:"sortKey" json:"sortKey"`
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func fillMissingSortKeys(db *gorm.DB) error {`
`111`	`111`	`if err := db.Order("user_id, sort_key, id ASC").Find(&apps).Error; err != nil && err != gorm.ErrRecordNotFound {`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`		`- fmt.Println("Migrating", len(apps), "application sort keys for")`
	`114`	`+ fmt.Println("Migrating", len(apps), "application sort keys")`
`115`	`115`
`116`	`116`	`sortKey := ""`
`117`	`117`	`currentUser := uint(math.MaxUint)`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,5 @@ type Application struct {`
`58`	`58`	`//`
`59`	`59`	`// required: true`
`60`	`60`	`// example: a1`
`61`		- SortKey string `gorm:"uniqueIndex:uix_application_user_id_sort_key,priority:2" form:"sortKey" query:"sortKey" json:"sortKey"`
	`61`	+ SortKey string `gorm:"type:bytes;uniqueIndex:uix_application_user_id_sort_key,priority:2,length:255" form:"sortKey" query:"sortKey" json:"sortKey"`
`62`	`62`	`}`