Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH] Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [DHH]

Added form_remote_for (form_for meets form_remote_tag) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3287 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index f4a08420b7..5a29ffaa30 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -77,6 +77,8 @@ module ActiveRecord
             options[:order] = @reflection.options[:order]
           end
 
+          merge_options_from_reflection!(options)
+
           # Pass through args exactly as we received them.
           args << options
           @reflection.klass.find(*args)
@@ -107,14 +109,7 @@ module ActiveRecord
           if @reflection.options[:finder_sql]
             @reflection.klass.find_by_sql(@finder_sql)
           else
-            @reflection.klass.find(:all, 
-              :conditions => @finder_sql,
-              :order      => @reflection.options[:order], 
-              :limit      => @reflection.options[:limit],
-              :joins      => @reflection.options[:joins],
-              :include    => @reflection.options[:include],
-              :group      => @reflection.options[:group]
-            )
+            find(:all)
           end
         end
 
@@ -129,6 +124,10 @@ module ActiveRecord
           
           @target = [] and loaded if count == 0
           
+          if @reflection.options[:limit]
+            count = [ @reflection.options[:limit], count ].min
+          end
+          
           return count
         end
 
@@ -171,7 +170,7 @@ module ActiveRecord
                 "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
                 "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, @owner.class).to_s}'"
               @finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions
-
+            
             else
               @finder_sql = "#{@reflection.klass.table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}"
               @finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions