diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:26:59 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 15:50:24 -0300 |
| commit | c470001891990b067f9e76b5a5c0ae49be1a507f (patch) | |
| tree | acabfb5ccaff4b31901d0759abd6d57d937f327b /activerecord/lib/active_record/locking | |
| parent | f09ae8538f3625468ee175d5a4d9782e0d5ba415 (diff) | |
| download | rails-c470001891990b067f9e76b5a5c0ae49be1a507f.tar.gz rails-c470001891990b067f9e76b5a5c0ae49be1a507f.tar.bz2 rails-c470001891990b067f9e76b5a5c0ae49be1a507f.zip | |
Merge pull request #5810 from kennyj/fix_5797
Fix #5797. Error calling dup method on AR model with serialized field
Conflicts:
activerecord/lib/active_record/core.rb
Diffstat (limited to 'activerecord/lib/active_record/locking')
| -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 0e33cdb617..7deac2588a 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -170,7 +170,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 |