From 2b33ef72e36e5c0e2e8ef37c24908abd06517520 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 20 Jan 2024 22:02:05 -0500 Subject: [PATCH] Remove offset and limit from count queries. Fixes #2443 --- persistence/radio_repository.go | 2 +- persistence/sql_base_repository.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/persistence/radio_repository.go b/persistence/radio_repository.go index 93727e4e..0c0f64d3 100644 --- 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 index b3fd7001..289e15f6 100644 --- 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 }