Remove offset and limit from count queries. Fixes #2443

navidrome · Jan 21, 2024 · 2b33ef7 · 2b33ef7
1 parent 2fb913f
commit 2b33ef7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/persistence/radio_repository.go b/persistence/radio_repository.go
@@ -35,7  35,7 @@ func (r *radioRepository) isPermitted() bool {
 }
 
 func (r *radioRepository) CountAll(options ...model.QueryOptions) (int64, error) {
-	sql := r.newSelect(options...)
 	sql := r.newSelect()
 	return r.count(sql, options...)
 }
 

diff --git a/persistence/sql_base_repository.go b/persistence/sql_base_repository.go
@@ -231,6  231,7 @@ func (r sqlRepository) exists(existsQuery SelectBuilder) (bool, error) {
 func (r sqlRepository) count(countQuery SelectBuilder, options ...model.QueryOptions) (int64, error) {
 	countQuery = countQuery.
 		RemoveColumns().Columns("count(distinct "   r.tableName   ".id) as count").
 		RemoveOffset().RemoveLimit().
 		From(r.tableName)
 	countQuery = r.applyFilters(countQuery, options...)
 	var res struct{ Count int64 }