aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking/optimistic.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-17 02:59:42 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-17 03:00:56 +0530
commitcd90dcb1bde5c411a55bcec97597a8fe22b56a5d (patch)
tree41d3c22a8c81d8bdbb4d79749aea495e1bc0a7aa /activerecord/lib/active_record/locking/optimistic.rb
parente9a1dbe79a6610793a71af227aaf64ff55554cad (diff)
downloadrails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.tar.gz
rails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.tar.bz2
rails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.zip
Rename Model.active_relation to Model.unscoped
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index f9e538c586..9fcdabdb44 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -78,7 +78,7 @@ module ActiveRecord
attribute_names.uniq!
begin
- relation = self.class.active_relation
+ relation = self.class.unscoped
affected_rows = relation.where(
relation[self.class.primary_key].eq(quoted_id).and(