aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-02-17 11:29:51 -0700
committerSean Griffin <sean@thoughtbot.com>2015-02-17 13:28:48 -0700
commit4a3cb840b0c992b0f15b66274dfa7de71a38fa03 (patch)
tree12911fe78b638c8328b8c882f02d3d0c35c29134 /activerecord/lib/active_record/locking
parentb3fdf9c596e4821e0028472b9c2740fd4d6655c8 (diff)
downloadrails-4a3cb840b0c992b0f15b66274dfa7de71a38fa03.tar.gz
rails-4a3cb840b0c992b0f15b66274dfa7de71a38fa03.tar.bz2
rails-4a3cb840b0c992b0f15b66274dfa7de71a38fa03.zip
`Type#type_cast_from_database` -> `Type#deserialize`
Diffstat (limited to 'activerecord/lib/active_record/locking')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb2
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 c5b10fcddf..a58d8355aa 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -185,7 +185,7 @@ module ActiveRecord
end
class LockingType < DelegateClass(Type::Value) # :nodoc:
- def type_cast_from_database(value)
+ def deserialize(value)
# `nil` *should* be changed to 0
super.to_i
end