fix(bun): Replace GroupBy clause with select distinct (#645)

Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de>
kyverno · Dec 20, 2024 · 4411c29 · 4411c29
1 parent b262a67
commit 4411c29
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/pkg/database/builder.go b/pkg/database/builder.go
@@ -129,6 +129,18 @@ func (q *QueryBuilder) Columns(columns ...string) *QueryBuilder {
 	return q
 }
 
+func (q *QueryBuilder) ColumnExpr(query string, args ...any) *QueryBuilder {
+	q.query.ColumnExpr(query, args...)
+
+	return q
+}
+
+func (q *QueryBuilder) Distinct() *QueryBuilder {
+	q.query.Distinct()
+
+	return q
+}
+
 func (q *QueryBuilder) Group(columns ...string) *QueryBuilder {
 	q.query.Group(columns...)
 

diff --git a/pkg/database/bun.go b/pkg/database/bun.go
@@ -386,8 +386,9 @@ func (s *Store) FetchNamespaceResourceResults(ctx context.Context, filter Filter
 }
 
 func (s *Store) CountNamespaceResourceResults(ctx context.Context, filter Filter) (int, error) {
-	query := FromQuery(s.db.NewSelect().Model((*ResourceResult)(nil))).
+	return FromQuery(s.db.NewSelect().Model((*ResourceResult)(nil))).
 		Columns("res.id").
+		Distinct().
 		FilterMap(map[string][]string{
 			"source":             filter.Sources,
 			"category":           filter.Categories,
@@ -399,10 +400,8 @@ func (s *Store) CountNamespaceResourceResults(ctx context.Context, filter Filter
 		FilterReportLabels(filter.ReportLabel).
 		Exclude(filter, "res").
 		NamespaceScope().
-		Group("res.id").
-		GetQuery()
-
-	return query.Count(ctx)
+		GetQuery().
+		Count(ctx)
 }
 
 func (s *Store) FetchClusterResourceResults(ctx context.Context, filter Filter, pagination Pagination) ([]ResourceResult, error) {
@@ -430,8 +429,9 @@ func (s *Store) FetchClusterResourceResults(ctx context.Context, filter Filter,
 }
 
 func (s *Store) CountClusterResourceResults(ctx context.Context, filter Filter) (int, error) {
-	query := FromQuery(s.db.NewSelect().Model((*ResourceResult)(nil))).
+	return FromQuery(s.db.NewSelect().Model((*ResourceResult)(nil))).
 		Columns("res.id").
+		Distinct().
 		FilterMap(map[string][]string{
 			"source":        filter.Sources,
 			"category":      filter.Categories,
@@ -442,10 +442,8 @@ func (s *Store) CountClusterResourceResults(ctx context.Context, filter Filter)
 		FilterReportLabels(filter.ReportLabel).
 		Exclude(filter, "res").
 		ClusterScope().
-		Group("res.id").
-		GetQuery()
-
-	return query.Count(ctx)
+		GetQuery().
+		Count(ctx)
 }
 
 func (s *Store) FetchResourceResults(ctx context.Context, id string, filter Filter) ([]ResourceResult, error) {