Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes).

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

2 files changed, 3 insertions, 3 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 9bc29b049f..3f6fdb6bac 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
@@ -41,7 +41,7 @@ module ActiveRecord
 
           options[:conditions] = conditions
           options[:joins] = @join_sql
-          options[:readonly] ||= false
+          options[:readonly] ||= !options[:joins].nil?
 
           if options[:order] && @reflection.options[:order]
             options[:order] = "#{options[:order]}, #{@reflection.options[:order]}"
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f6bee7b6ae..8078b4113b 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1325,7 +1325,7 @@ module ActiveRecord #:nodoc:
           unless options.has_key?(:readonly)
             if scoped?(:find, :readonly)
               options[:readonly] = scope(:find, :readonly)
-            elsif !options[:joins].blank?
+            elsif !options[:joins].blank? && !options[:select]
               options[:readonly] = true
             end
           end
@@ -2064,4 +2064,4 @@ module ActiveRecord #:nodoc:
         value
       end
   end
-end
\ No newline at end of file
+end