From 7892543a88e5ec2329e3834a591a7b3b80d165f0 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Wed, 20 Oct 2010 19:13:18 -0300 Subject: Don't change tests, fix code: if locking is enabled skip IM. --- activerecord/lib/active_record/relation.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 4ea0c0f2b4..52d5802ee0 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -61,7 +61,7 @@ module ActiveRecord def to_a return @records if loaded? - @records = if @readonly_value.nil? + @records = if @readonly_value.nil? && !@klass.locking_enabled? eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values) else IdentityMap.without do -- cgit v1.2.3