diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-04-28 18:54:31 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-04-28 18:54:31 -0300 |
| commit | 03b62b8420497b393e1e205168961d23ff51ecab (patch) | |
| tree | 96ac34a85ac33aaba9c14ff99e9b87850d4162e8 /activerecord/lib/active_record | |
| parent | ef5c46d2ee8dc8da20f54dbedc9805f71791d75c (diff) | |
| parent | ba05b3c218568467277ea309dcfd10d34bf8e756 (diff) | |
| download | rails-03b62b8420497b393e1e205168961d23ff51ecab.tar.gz rails-03b62b8420497b393e1e205168961d23ff51ecab.tar.bz2 rails-03b62b8420497b393e1e205168961d23ff51ecab.zip | |
Merge pull request #24653 from kbrock/kinder_locking_column
schema_load triggers 2nd schema_load (via locking)
Diffstat (limited to 'activerecord/lib/active_record')
| -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 1040327a5d..1e37ffefc6 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -150,7 +150,7 @@ module ActiveRecord # The version column used for optimistic locking. Defaults to +lock_version+. def locking_column - reset_locking_column unless defined?(@locking_column) + @locking_column = DEFAULT_LOCKING_COLUMN unless defined?(@locking_column) @locking_column end |