MyFavMirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-25 22:55:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert collection queries back to left_join

Browse Source 
Using the `inner_join` seems to cause issues, even though i have tested
it. Strangely it does cause issues. Reverting it back to `left_join`
seems to solve the issue for me.

Fixes #2975
This commit is contained in:
BlackDex 2022-12-12 12:21:48 +01:00
parent b7c9a346c1
commit d9c0c23819
No known key found for this signature in database
GPG Key ID: 58C80A2AA6C765E1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/db/models/collection.rs
View File

@ -167,15 +167,15 @@ impl Collection {
users_collections::user_uuid.eq(user_uuid.clone()) users_collections::user_uuid.eq(user_uuid.clone())
) )
)) ))
.inner_join(users_organizations::table.on( .left_join(users_organizations::table.on(
collections::org_uuid.eq(users_organizations::org_uuid).and( collections::org_uuid.eq(users_organizations::org_uuid).and(
users_organizations::user_uuid.eq(user_uuid.clone()) users_organizations::user_uuid.eq(user_uuid.clone())
) )
)) ))
.inner_join(groups_users::table.on( .left_join(groups_users::table.on(
groups_users::users_organizations_uuid.eq(users_organizations::uuid) groups_users::users_organizations_uuid.eq(users_organizations::uuid)
)) ))
.inner_join(groups::table.on( .left_join(groups::table.on(
groups::uuid.eq(groups_users::groups_uuid) groups::uuid.eq(groups_users::groups_uuid)
)) ))
.left_join(collections_groups::table.on( .left_join(collections_groups::table.on(
@ -252,15 +252,15 @@ impl Collection {
users_collections::user_uuid.eq(user_uuid.clone()) users_collections::user_uuid.eq(user_uuid.clone())
) )
)) ))
.inner_join(users_organizations::table.on( .left_join(users_organizations::table.on(
collections::org_uuid.eq(users_organizations::org_uuid).and( collections::org_uuid.eq(users_organizations::org_uuid).and(
users_organizations::user_uuid.eq(user_uuid) users_organizations::user_uuid.eq(user_uuid)
) )
)) ))
.inner_join(groups_users::table.on( .left_join(groups_users::table.on(
groups_users::users_organizations_uuid.eq(users_organizations::uuid) groups_users::users_organizations_uuid.eq(users_organizations::uuid)
)) ))
.inner_join(groups::table.on( .left_join(groups::table.on(
groups::uuid.eq(groups_users::groups_uuid) groups::uuid.eq(groups_users::groups_uuid)
)) ))
.left_join(collections_groups::table.on( .left_join(collections_groups::table.on(