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, 3 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 417b0905f4..5b203dcc57 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -49,6 +49,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)
@@ -88,7 +90,7 @@ module ActiveRecord
           if @reflection.options[:finder_sql]
             records = @reflection.klass.find_by_sql(@finder_sql)
           else
-            records = find(:all, :include => @reflection.options[:include])
+            records = find(:all)
           end
           
           @reflection.options[:uniq] ? uniq(records) : records