Read about our upcoming Code of Conduct on this issue

Commit 0d08269d authored by Andreas Brandl's avatar Andreas Brandl
Browse files

Rename use_conditions_only option to use_where_in.

parent 2ec2348af1c3
......@@ -56,7 +56,7 @@ def authorized_snippets
end
def feature_available_projects
projects = Project.public_or_visible_to_user(current_user, use_conditions_only: false) do |part|
projects = Project.public_or_visible_to_user(current_user, use_where_in: false) do |part|
part.with_feature_available_for_user(:snippets, current_user)
end.select(:id)
......
......@@ -322,10 +322,10 @@ class Project < ActiveRecord::Base
# This is useful for performance as we can stick those additional filters
# at the bottom of e.g. the UNION.
#
# Optionally, turning `use_conditions_only` off leads to returning a
# Optionally, turning `use_where_in` off leads to returning a
# relation using #from instead of #where. This can perform much better
# but leads to trouble when used in conjunction with AR's #merge method.
def self.public_or_visible_to_user(user = nil, use_conditions_only: true, &block)
def self.public_or_visible_to_user(user = nil, use_where_in: true, &block)
# If we don't get a block passed, use identity to avoid if/else repetitions
block = ->(part) { part } unless block_given?
......@@ -348,7 +348,7 @@ def self.public_or_visible_to_user(user = nil, use_conditions_only: true, &block
# performance.
union = Gitlab::SQL::Union.new([authorized_projects.select('projects.id'), visible_projects.select('projects.id')])
if use_conditions_only
if use_where_in
where("projects.id IN (#{union.to_sql})") # rubocop:disable GitlabSecurity/SqlInjection
else
from("(#{union.to_sql}) AS #{table_name}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment