aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2013-07-13 22:02:05 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2013-07-13 22:02:05 -0700
commit5a52fbe1cbfe3c58184f33ca1bfc451e6e473284 (patch)
treea935947cda24a604a3c7eeea203a22e3ad638915 /activerecord/test/cases
parentba8b55f7911b4a74e151639150f997cca47488c9 (diff)
parent33354aa23e9d34bdf5aae8ab942cf830bf9f2782 (diff)
downloadrails-5a52fbe1cbfe3c58184f33ca1bfc451e6e473284.tar.gz
rails-5a52fbe1cbfe3c58184f33ca1bfc451e6e473284.tar.bz2
rails-5a52fbe1cbfe3c58184f33ca1bfc451e6e473284.zip
Merge pull request #11424 from kennyj/fix_column_defaults_caching
Reset @column_defaults when assigning locking_column.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/locking_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 827fcf3d50..db7d3b80ab 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -17,6 +17,7 @@ class LockWithoutDefault < ActiveRecord::Base; end
class LockWithCustomColumnWithoutDefault < ActiveRecord::Base
self.table_name = :lock_without_defaults_cust
+ self.column_defaults # to test @column_defaults caching.
self.locking_column = :custom_lock_version
end