8a72f5c427
This commit adds the module `FromUnion`, which provides the class method
`from_union`. This simplifies the process of selecting data from the
result of a UNION, and reduces the likelihood of making mistakes. As a
result, instead of this:
union = Gitlab::SQL::Union.new([foo, bar])
Foo.from("(#{union.to_sql}) #{Foo.table_name}")
We can now write this instead:
Foo.from_union([foo, bar])
This commit also includes some changes to make this new setup work
properly. For example, a bug in Rails 4
(https://github.com/rails/rails/issues/24193) would break the use of
`from("sub-query-here").includes(:relation)` in certain cases. There was
also a CI query which appeared to repeat a lot of conditions from an
outer query on an inner query, which isn't necessary.
Finally, we include a RuboCop cop to ensure developers use this new
module, instead of using Gitlab::SQL::Union directly.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
72 lines
2.4 KiB
Ruby
72 lines
2.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class MembersFinder
|
|
attr_reader :project, :current_user, :group
|
|
|
|
def initialize(project, current_user)
|
|
@project = project
|
|
@current_user = current_user
|
|
@group = project.group
|
|
end
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def execute(include_descendants: false)
|
|
project_members = project.project_members
|
|
project_members = project_members.non_invite unless can?(current_user, :admin_project, project)
|
|
|
|
if group
|
|
group_members = GroupMembersFinder.new(group).execute(include_descendants: include_descendants) # rubocop: disable CodeReuse/Finder
|
|
group_members = group_members.non_invite
|
|
|
|
union = Gitlab::SQL::Union.new([project_members, group_members], remove_duplicates: false) # rubocop: disable Gitlab/Union
|
|
|
|
sql = distinct_on(union)
|
|
|
|
Member.includes(:user).from("(#{sql}) AS #{Member.table_name}")
|
|
else
|
|
project_members
|
|
end
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def can?(*args)
|
|
Ability.allowed?(*args)
|
|
end
|
|
|
|
private
|
|
|
|
def distinct_on(union)
|
|
# We're interested in a list of members without duplicates by user_id.
|
|
# We prefer project members over group members, project members should go first.
|
|
if Gitlab::Database.postgresql?
|
|
<<~SQL
|
|
SELECT DISTINCT ON (user_id, invite_email) member_union.*
|
|
FROM (#{union.to_sql}) AS member_union
|
|
ORDER BY user_id,
|
|
invite_email,
|
|
CASE
|
|
WHEN type = 'ProjectMember' THEN 1
|
|
WHEN type = 'GroupMember' THEN 2
|
|
ELSE 3
|
|
END
|
|
SQL
|
|
else
|
|
# Older versions of MySQL do not support window functions (and DISTINCT ON is postgres-specific).
|
|
<<~SQL
|
|
SELECT t1.*
|
|
FROM (#{union.to_sql}) AS t1
|
|
JOIN (
|
|
SELECT
|
|
COALESCE(user_id, -1) AS user_id,
|
|
COALESCE(invite_email, 'NULL') AS invite_email,
|
|
MIN(CASE WHEN type = 'ProjectMember' THEN 1 WHEN type = 'GroupMember' THEN 2 ELSE 3 END) AS type_number
|
|
FROM
|
|
(#{union.to_sql}) AS t3
|
|
GROUP BY COALESCE(user_id, -1), COALESCE(invite_email, 'NULL')
|
|
) AS t2 ON COALESCE(t1.user_id, -1) = t2.user_id
|
|
AND COALESCE(t1.invite_email, 'NULL') = t2.invite_email
|
|
AND CASE WHEN t1.type = 'ProjectMember' THEN 1 WHEN t1.type = 'GroupMember' THEN 2 ELSE 3 END = t2.type_number
|
|
SQL
|
|
end
|
|
end
|
|
end
|