From 7682ecd28576d1e2fa500a59b1b028180d2e81d9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 9 Aug 2022 10:05:23 -0400 Subject: [PATCH] RBAC: Remove sort and unique values when fetching permissions (#53461) (#53467) * RBAC: remove sort and unique values for fetching permissions (cherry picked from commit e4c45c4f9819fa2f27cf8a824c44f0ea2a9c5553) Co-authored-by: Karl Persson --- pkg/services/accesscontrol/database/database.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go index 5ed5f267f1a..a6d76ad8cde 100644 --- a/pkg/services/accesscontrol/database/database.go +++ b/pkg/services/accesscontrol/database/database.go @@ -26,8 +26,7 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces err := s.sql.WithDbSession(ctx, func(sess *sqlstore.DBSession) error { filter, params := userRolesFilter(query.OrgID, query.UserID, query.Roles) - // TODO: optimize this - q := `SELECT DISTINCT + q := `SELECT permission.action, permission.scope FROM permission @@ -45,10 +44,6 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces } } - q += ` - ORDER BY permission.scope - ` - if err := sess.SQL(q, params...).Find(&result); err != nil { return err }