aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-xactiverecord/lib/active_record/base.rb4
1 files changed, 2 insertions, 2 deletions
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