remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-09 19:07:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(pglite): count through a subquery and drop the rowid pagination trick

Browse source 
A count built from a sorted builder failed with 'column must appear in
the GROUP BY clause' (the library list); counting the ids in a subquery
makes the carried ORDER BY harmless. optimizePagination relied on
SQLite's rowid and is now a no-op.
This commit is contained in:
Deluan 2026-09-05 02:19:30 -04:00
commit 02b13f0549
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
persistence/sql_base_repository.go
View file

@ -457,14 +457,8 @@ func (r sqlRepository) queryAllSlice(sq SelectBuilder, response any) error {
// optimizePagination uses a less inefficient pagination, by not using OFFSET.
// See https://gist.github.com/ssokolow/262503
func (r sqlRepository) optimizePagination(sq SelectBuilder, options model.QueryOptions) SelectBuilder {
if options.Offset > conf.Server.DevOffsetOptimize {
sq = sq.RemoveOffset()
rowidSq := sq.RemoveColumns().Columns(r.tableName + ".rowid")
rowidSq = rowidSq.Limit(uint64(options.Offset))
rowidSql, args, _ := rowidSq.ToSql()
sq = sq.Where(r.tableName+".rowid not in ("+rowidSql+")", args...)
}
func (r sqlRepository) optimizePagination(sq SelectBuilder, _ model.QueryOptions) SelectBuilder {
// The SQLite rowid trick for deep offsets does not apply to PostgreSQL; plain OFFSET is used.
return sq
}
@ -535,11 +529,14 @@ func (r sqlRepository) classifyOwnedWriteMiss(id string) error {
}
func (r sqlRepository) count(countQuery SelectBuilder, options ...model.QueryOptions) (int64, error) {
countQuery = countQuery.
RemoveColumns().Columns("count(distinct " + r.tableName + ".id) as count").
// Counted through a subquery so a sort carried by the builder (PostgreSQL rejects ORDER BY on
// a column that is neither grouped nor aggregated) stays harmless.
inner := countQuery.
RemoveColumns().Columns(r.tableName + ".id").
RemoveOffset().RemoveLimit().
From(r.tableName)
countQuery = r.applyFilters(countQuery, options...)
inner = r.applyFilters(inner, options...)
countQuery = Select("count(distinct t.id) as count").FromSelect(inner, "t")
var res struct{ Count int64 }
err := r.queryOne(countQuery, &res)
return res.Count, err