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
33 lines
970 B
Ruby
33 lines
970 B
Ruby
module Gitlab
|
|
module ProjectAuthorizations
|
|
# Calculating new project authorizations when not supporting nested groups.
|
|
class WithoutNestedGroups
|
|
attr_reader :user
|
|
|
|
# user - The User object for which to calculate the authorizations.
|
|
def initialize(user)
|
|
@user = user
|
|
end
|
|
|
|
def calculate
|
|
relations = [
|
|
# Projects the user is a direct member of
|
|
user.projects.select_for_project_authorization,
|
|
|
|
# Personal projects
|
|
user.personal_projects.select_as_maintainer_for_project_authorization,
|
|
|
|
# Projects of groups the user is a member of
|
|
user.groups_projects.select_for_project_authorization,
|
|
|
|
# Projects shared with groups the user is a member of
|
|
user.groups.joins(:shared_projects).select_for_project_authorization
|
|
]
|
|
|
|
ProjectAuthorization
|
|
.unscoped
|
|
.select_from_union(relations)
|
|
end
|
|
end
|
|
end
|
|
end
|