DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix role member selects

Browse Source
This commit is contained in:
Denis Arh 2020-09-10 15:02:20 +02:00
parent 464a8ecd93
commit ef59b4deca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
store/rdbms/roles.go
View File

@ -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 != "" {

2
store/rdbms/users.go
View File

@ -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)