Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Issue with accessible_by and ActiveRecord SQL JOIN behavior #1002

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Issue with accessible_by and ActiveRecord SQL JOIN behavior #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
094e75f
removing the rvmrc file.. super out of date anyway
jackryon Apr 11, 2014
50d8a85
swapping the joins call in active_record_adapted#database_records for…
jackryon Apr 11, 2014
d0f0479
prying
jackryon Apr 11, 2014
df04d8d
puts statements for debugging
jackryon Apr 11, 2014
af6b9d7
trying to debug this with some dum puts statements
jackryon Apr 11, 2014
ac59387
jackjackjack
jackryon Apr 11, 2014
67e5093
fooling around with gemfile.lock
jackryon Apr 11, 2014
5e0a772
removing debugging calls
jackryon Apr 11, 2014
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: 0 additions & 1 deletion .rvmrc
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion lib/cancan/model_adapters/active_record_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ def database_records
elsif @model_class.respond_to?(:where) && @model_class.respond_to?(:joins)
mergeable_conditions = @rules.select {|rule| rule.unmergeable? }.blank?
if mergeable_conditions
@model_class.where(conditions).joins(joins)
#@model_class.where(conditions).joins(joins)
@model_class.where(conditions).includes(joins)
else
@model_class.where(*(@rules.map(&:conditions))).joins(joins)
end
Expand Down