diff options
| author | Rick Olson <technoweenie@gmail.com> | 2008-03-24 02:50:02 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2008-03-24 02:50:02 +0000 |
| commit | 081ddb6f24d70794ee9e071d3ed5302f52b26c4d (patch) | |
| tree | a5c8e4a4f02cd38cfb182bdaf0e8491c7a0586d4 /activerecord/lib/active_record/associations/has_many_association.rb | |
| parent | 5bf4cbbdb74dfaaac258dc93e54dcae8295211e9 (diff) | |
| download | rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.tar.gz rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.tar.bz2 rails-081ddb6f24d70794ee9e071d3ed5302f52b26c4d.zip | |
Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 054a8991da..eedffa052b 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -167,7 +167,10 @@ module ActiveRecord def construct_scope create_scoping = {} set_belongs_to_association_for(create_scoping) - { :find => { :conditions => @finder_sql, :readonly => false, :order => @reflection.options[:order], :limit => @reflection.options[:limit] }, :create => create_scoping } + { + :find => { :conditions => @finder_sql, :readonly => false, :order => @reflection.options[:order], :limit => @reflection.options[:limit] }, + :create => create_scoping + } end end end |