From ef59b4deca484b723880eded3cf3fb329f58eb73 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 10 Sep 2020 15:02:20 +0200 Subject: [PATCH] Fix role member selects --- store/rdbms/roles.go | 2 +- store/rdbms/users.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/store/rdbms/roles.go b/store/rdbms/roles.go index 146005221..2aa15467f 100644 --- a/store/rdbms/roles.go +++ b/store/rdbms/roles.go @@ -18,7 +18,7 @@ func (s Store) convertRoleFilter(f types.RoleFilter) (query squirrel.SelectBuild } if f.MemberID > 0 { - query = query.Where(squirrel.Expr("rl.ID IN (SELECT rel_role FROM sys_role_member AS m WHERE m.rel_user = ?)", f.MemberID)) + query = query.Where(squirrel.Expr("rl.ID IN (SELECT rel_role FROM role_members AS m WHERE m.rel_user = ?)", f.MemberID)) } if f.Query != "" { diff --git a/store/rdbms/users.go b/store/rdbms/users.go index 09f67404a..186a5afc2 100644 --- a/store/rdbms/users.go +++ b/store/rdbms/users.go @@ -23,7 +23,7 @@ func (s Store) convertUserFilter(f types.UserFilter) (query squirrel.SelectBuild // Due to lack of support for more exotic expressions (slice of values inside subquery) // we'll use set of OR expressions as a workaround for _, roleID := range f.RoleID { - or = append(or, squirrel.Expr("usr.ID IN (SELECT rel_user FROM sys_role_member WHERE rel_role = ?)", roleID)) + or = append(or, squirrel.Expr("usr.ID IN (SELECT rel_user FROM role_members WHERE rel_role = ?)", roleID)) } query = query.Where(or)