diff options
author | Jamis Buck <jamis@37signals.com> | 2007-02-07 16:10:40 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2007-02-07 16:10:40 +0000 |
commit | 83752373b9c83bf585b5fe44836c65612b680cf9 (patch) | |
tree | 0096d86743e56f8266daa280d4e364db734e3dab /activerecord/lib/active_record/locking/optimistic.rb | |
parent | f458b376c545d8eae5189d1ecc16245cafe7e796 (diff) | |
download | rails-83752373b9c83bf585b5fe44836c65612b680cf9.tar.gz rails-83752373b9c83bf585b5fe44836c65612b680cf9.tar.bz2 rails-83752373b9c83bf585b5fe44836c65612b680cf9.zip |
Made increment_counter/decrement_counter play nicely with optimistic locking, and added a more general update_counters method
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6139 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
-rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 02cf565017..217bd3def7 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -31,14 +31,14 @@ module ActiveRecord base.alias_method_chain :update, :lock base.alias_method_chain :attributes_from_column_definition, :lock - + class << base alias_method :locking_column=, :set_locking_column end end def locking_enabled? #:nodoc: - lock_optimistically && respond_to?(self.class.locking_column) + self.class.locking_enabled? end def attributes_from_column_definition_with_lock @@ -80,6 +80,20 @@ module ActiveRecord module ClassMethods DEFAULT_LOCKING_COLUMN = 'lock_version' + def self.extended(base) + class <<base + alias_method_chain :update_counters, :lock + end + end + + # Is optimistic locking enabled for this table? Returns true if the + # #lock_optimistically flag is set to true (which it is, by default) + # and the table includes the #locking_column column (defaults to + # lock_version). + def locking_enabled? + lock_optimistically && columns_hash[locking_column] + end + # Set the column to use for optimistic locking. Defaults to lock_version. def set_locking_column(value = nil, &block) define_attr_method :locking_column, value, &block @@ -100,6 +114,13 @@ module ActiveRecord def reset_locking_column set_locking_column DEFAULT_LOCKING_COLUMN end + + # make sure the lock version column gets updated when counters are + # updated. + def update_counters_with_lock(id, counters) + counters = counters.merge(locking_column => 1) if locking_enabled? + update_counters_without_lock(id, counters) + end end end end |