Try UNION on Group visible scope

2026-06-14 03:30:14 +00:00 · 2025-10-21 13:45:18 +02:00
parent 8639406789
commit ab0a4e09b7
1 changed files with 5 additions and 5 deletions
@@ -43,12 +43,12 @@ module Groups::Scopes
        if user.allowed_globally?(:view_all_principals)
          all
        else
-          # Always use subqueries with unscoped to avoid join conflicts
          where(
-            id: Group.unscoped.in_visible_project(user).select(:id)
-          ).or(
-            where(
-              id: Group.unscoped.containing_user(user).select(:id)
+            Group.arel_table[:id].in(
+              Arel::Nodes::UnionAll.new(
+                Group.unscoped.containing_user(user).select(:id).arel,
+                Group.unscoped.in_visible_project(user).select(:id).arel
+              )
            )
          )
        end