diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-17 14:57:55 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-17 14:57:55 -0300 |
| commit | 63b347df427ed2189fac7e75e36a3a4b9f6c2a68 (patch) | |
| tree | 59278a753e92ff7a0e4ccc60ecdf87ce80d849e3 /activerecord/lib/active_record/base.rb | |
| parent | e7a8fda0336fe733adbdd0bdb642a09327ef22f1 (diff) | |
| parent | e30d701afe08acaa1c04da50791f07d4bb4efa83 (diff) | |
| download | rails-63b347df427ed2189fac7e75e36a3a4b9f6c2a68.tar.gz rails-63b347df427ed2189fac7e75e36a3a4b9f6c2a68.tar.bz2 rails-63b347df427ed2189fac7e75e36a3a4b9f6c2a68.zip | |
Merge pull request #15771 from sgrif/sg-stop-messing-with-column-defaults
Don't mess with `column_defaults` when optimistic locking is enabled
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 0b788ea1f9..662c99269e 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -308,10 +308,10 @@ module ActiveRecord #:nodoc: include Integration include Validations include CounterCache - include Locking::Optimistic - include Locking::Pessimistic include Attributes include AttributeDecorators + include Locking::Optimistic + include Locking::Pessimistic include AttributeMethods include Callbacks include Timestamp |