diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:26:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:26:59 -0700 |
| commit | 1b075220ef59bbee59bb768acbc0d92e59ca38d6 (patch) | |
| tree | ff31a015e259dcd5fab379fc3feb4ae451cec692 /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | 7c1b61e50ee44abd4f6440067ec11f7ccd01df3c (diff) | |
| parent | d09b2fd09dbd8f74d1d2909c7e931fb0a664b315 (diff) | |
| download | rails-1b075220ef59bbee59bb768acbc0d92e59ca38d6.tar.gz rails-1b075220ef59bbee59bb768acbc0d92e59ca38d6.tar.bz2 rails-1b075220ef59bbee59bb768acbc0d92e59ca38d6.zip | |
Merge pull request #5810 from kennyj/fix_5797
Fix #5797. Error calling dup method on AR model with serialized field
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
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 a3412582fa..05e052b953 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -168,7 +168,7 @@ module ActiveRecord # start the lock version at zero. Note we can't use # <tt>locking_enabled?</tt> at this point as # <tt>@attributes</tt> may not have been initialized yet. - def initialize_attributes(attributes) #:nodoc: + def initialize_attributes(attributes, options = {}) #:nodoc: if attributes.key?(locking_column) && lock_optimistically attributes[locking_column] ||= 0 end |