aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2013-04-10 14:33:20 -0400
committerNeeraj Singh <neerajdotname@gmail.com>2013-04-10 14:33:20 -0400
commiteb750e2127d163be46423bcdfc08b420afa58071 (patch)
treeab9ba9e7614b2db0f6a5d2dbffbbbfcdc5250b9d /activerecord
parent8c883855b40d4ecfb52329ab2de72755be6ad1ba (diff)
downloadrails-eb750e2127d163be46423bcdfc08b420afa58071.tar.gz
rails-eb750e2127d163be46423bcdfc08b420afa58071.tar.bz2
rails-eb750e2127d163be46423bcdfc08b420afa58071.zip
remove_duplicate_results! should be protected
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index d3ceecb090..93b088790e 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -58,6 +58,8 @@ module ActiveRecord
records
end
+ protected
+
def remove_duplicate_results!(base, records, associations)
case associations
when Symbol, String
@@ -88,8 +90,6 @@ module ActiveRecord
end
end
- protected
-
def cache_joined_association(association)
associations = []
parent = association.parent