aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-07-09 17:24:10 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-07-09 17:24:10 -0700
commita4c0281dada222d350dc337c3b283e4254b07f1b (patch)
treead8b8f87a433500407cbf18b894d2f588c313061 /activerecord/lib
parent8004c91eb67b5d690a4eb8ed4ee475a6d2dc0d6c (diff)
downloadrails-a4c0281dada222d350dc337c3b283e4254b07f1b.tar.gz
rails-a4c0281dada222d350dc337c3b283e4254b07f1b.tar.bz2
rails-a4c0281dada222d350dc337c3b283e4254b07f1b.zip
fix visibility of the relation construction methods
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 5ce889ce50..2d3bd563ac 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -238,7 +238,7 @@ module ActiveRecord
raise RecordNotFound, error
end
- protected
+ private
def find_with_associations
join_dependency = construct_join_dependency
@@ -290,6 +290,12 @@ module ActiveRecord
id_rows.map {|row| row[primary_key]}
end
+ def using_limitable_reflections?(reflections)
+ reflections.none? { |r| r.collection? }
+ end
+
+ protected
+
def find_with_ids(*ids)
expects_array = ids.first.kind_of?(Array)
return ids.first if expects_array && ids.first.empty?
@@ -379,9 +385,5 @@ module ActiveRecord
end
end
end
-
- def using_limitable_reflections?(reflections)
- reflections.none? { |r| r.collection? }
- end
end
end