diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-01-02 20:33:18 +0000 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 16:24:31 -0800 |
commit | 3103296a61709e808aa89c3d37cf22bcdbc5a675 (patch) | |
tree | 2f8b031165014329b4c77a785c17f06c056bf850 /activerecord/lib/active_record/associations/has_many_association.rb | |
parent | d6289aadce1b8fa93e799500e52f92ce8d159d6f (diff) | |
download | rails-3103296a61709e808aa89c3d37cf22bcdbc5a675.tar.gz rails-3103296a61709e808aa89c3d37cf22bcdbc5a675.tar.bz2 rails-3103296a61709e808aa89c3d37cf22bcdbc5a675.zip |
Let AssociationCollection#find use #scoped to do its finding. Note that I am removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences.
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 0d044b28e4..ca02aa8612 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -71,16 +71,6 @@ module ActiveRecord end end - def construct_find_scope - { - :conditions => construct_conditions, - :readonly => false, - :order => @reflection.options[:order], - :limit => @reflection.options[:limit], - :include => @reflection.options[:include] - } - end - def construct_create_scope construct_owner_attributes end |