From eb750e2127d163be46423bcdfc08b420afa58071 Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Wed, 10 Apr 2013 14:33:20 -0400 Subject: remove_duplicate_results! should be protected --- activerecord/lib/active_record/associations/join_dependency.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/associations') 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 -- cgit v1.2.3