diff options
| author | siddharth@vinsol.com <siddharth@vinsol.com> | 2014-11-20 01:35:04 +0530 |
|---|---|---|
| committer | siddharth@vinsol.com <siddharth@vinsol.com> | 2014-11-21 21:13:11 +0530 |
| commit | 91e3dab804fffe0b1daebb438091418faa1fa256 (patch) | |
| tree | 9ac7acc6a00c82e787cb010d15d9c9be666fa667 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 7e375afba30951b60a3e606ccbfe3f28b0df5e1a (diff) | |
| download | rails-91e3dab804fffe0b1daebb438091418faa1fa256.tar.gz rails-91e3dab804fffe0b1daebb438091418faa1fa256.tar.bz2 rails-91e3dab804fffe0b1daebb438091418faa1fa256.zip | |
Fix includes on association with a scope containing joins along with conditions
on the joined assoiciation
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index eb69943551..6e384facce 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -427,14 +427,12 @@ module ActiveRecord # => SELECT "users".* FROM "users" LEFT JOIN bookmarks ON bookmarks.bookmarkable_type = 'Post' AND bookmarks.user_id = users.id def joins(*args) check_if_method_has_arguments!(:joins, args) - - args.compact! - args.flatten! - spawn.joins!(*args) end def joins!(*args) # :nodoc: + args.compact! + args.flatten! self.joins_values += args self end |