Reset @column_defaults when assigning .

1 files changed, 13 insertions, 0 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 1eb2f2d130..404443f4ad 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,16 @@
+*   Reset @column_defaults when assigning `locking_column`.
+    We had a potential problem. For example:
+
+    class Post < ActiveRecord::Base
+      self.column_defaults  # if we call this unintentionally before setting locking_column ...
+      self.locking_column = 'my_locking_column'
+    end
+
+    Post.column_defaults["my_locking_column"]
+    => nil # expected value is 0 !
+
+    *kennyj*
+
 *   Remove extra select and update queries on save/touch/destroy ActiveRecord model
     with belongs to reflection with option `touch: true`.