Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug exists subquery #757

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cancancan.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
s.add_development_dependency 'rubocop', '~> 0.63.1'
s.add_development_dependency 'byebug', '~> 9.0', '>= 9.0.0'
end
1 change: 1 addition & 0 deletions lib/cancan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@
require 'cancan/model_adapters/strategies/base'
require 'cancan/model_adapters/strategies/left_join'
require 'cancan/model_adapters/strategies/subquery'
require 'cancan/model_adapters/strategies/exists_subquery'
end
12 changes: 9 additions & 3 deletions lib/cancan/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
module CanCan
def self.valid_accessible_by_strategies
strategies = [:left_join]
strategies << :subquery unless does_not_support_subquery_strategy?
unless does_not_support_subquery_strategy?
strategies.push(*subquery_strategies)
end
strategies
end

def self.subquery_strategies
[:subquery, :exists_subquery]
end

# Determines how CanCan should build queries when calling accessible_by,
# if the query will contain a join. The default strategy is `:subquery`.
#
Expand Down Expand Up @@ -40,8 +46,8 @@ def self.default_accessible_by_strategy
def self.accessible_by_strategy=(value)
validate_accessible_by_strategy!(value)

if value == :subquery && does_not_support_subquery_strategy?
raise ArgumentError, 'accessible_by_strategy = :subquery requires ActiveRecord 5 or newer'
if subquery_strategies.include?(value) && does_not_support_subquery_strategy?
raise ArgumentError, "accessible_by_strategy = #{value} requires ActiveRecord 5 or newer"
end

@accessible_by_strategy = value
Expand Down
22 changes: 22 additions & 0 deletions lib/cancan/model_adapters/strategies/exists_subquery.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
module CanCan
module ModelAdapters
class Strategies
class ExistsSubquery < Base
def execute!
model_class.where(joined_alias_exists_subquery_inner_query.arel.exists)
end

def joined_alias_exists_subquery_inner_query
model_class
.select('1')
.left_joins(joins)
.where(*where_conditions)
.where(
"#{quoted_table_name}.#{quoted_primary_key} = " \
"#{quoted_aliased_table_name}.#{quoted_primary_key}"
)
end
end
end
end
end
8 changes: 1 addition & 7 deletions lib/cancan/model_adapters/strategies/subquery.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ module ModelAdapters
class Strategies
class Subquery < Base
def execute!
build_joins_relation_subquery(where_conditions)
end

def build_joins_relation_subquery(where_conditions)
inner = model_class.unscoped do
model_class.left_joins(joins).where(*where_conditions)
end
inner = model_class.unscoped { model_class.left_joins(joins).where(*where_conditions) }
model_class.where(model_class.primary_key => inner)
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ class Editor < ActiveRecord::Base
if CanCan::ModelAdapters::ActiveRecordAdapter.version_greater_or_equal?('5.0.0')
describe 'selecting custom columns' do
it 'extracts custom columns correctly' do
posts = Post.accessible_by(ability).where(published: true).select('title as mytitle')
posts = Post.where(title: 'a').accessible_by(ability).where(published: true).select('title as mytitle')
puts posts.to_sql
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check output to see the issue

expect(posts[0].mytitle).to eq 'post1'
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

Bundler.require

require 'byebug'
require 'matchers'
require 'cancan/matchers'

Expand Down