arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: ormer.Driver() is not available when creating orms with NewOrmWithDB()

Browse Source
This commit is contained in:
Deluan
2020-02-28 16:09:27 -05:00
parent 1d886156d5
commit 0850872b0f
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
persistence/album_repository.go
-5
View File
@@ -71,12 +71,7 @@ func (r *albumRepository) GetAll(options ...model.QueryOptions) (model.Albums, e
// TODO Keep order when paginating // TODO Keep order when paginating
func (r *albumRepository) GetRandom(options ...model.QueryOptions) (model.Albums, error) { func (r *albumRepository) GetRandom(options ...model.QueryOptions) (model.Albums, error) {
sq := r.selectAlbum(options...) sq := r.selectAlbum(options...)
switch r.ormer.Driver().Type() {
case orm.DRMySQL:
sq = sq.OrderBy("RAND()")
default:
sq = sq.OrderBy("RANDOM()") sq = sq.OrderBy("RANDOM()")
}
results := model.Albums{} results := model.Albums{}
err := r.queryAll(sq, &results) err := r.queryAll(sq, &results)
return results, err return results, err
persistence/mediafile_repository.go
-5
View File
@@ -100,12 +100,7 @@ func (r mediaFileRepository) GetStarred(options ...model.QueryOptions) (model.Me
// TODO Keep order when paginating // TODO Keep order when paginating
func (r mediaFileRepository) GetRandom(options ...model.QueryOptions) (model.MediaFiles, error) { func (r mediaFileRepository) GetRandom(options ...model.QueryOptions) (model.MediaFiles, error) {
sq := r.selectMediaFile(options...) sq := r.selectMediaFile(options...)
switch r.ormer.Driver().Type() {
case orm.DRMySQL:
sq = sq.OrderBy("RAND()")
default:
sq = sq.OrderBy("RANDOM()") sq = sq.OrderBy("RANDOM()")
}
results := model.MediaFiles{} results := model.MediaFiles{}
err := r.queryAll(sq, &results) err := r.queryAll(sq, &results)
return results, err return results, err