aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods/read.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 16:49:26 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-09 16:49:26 -0300
commit9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb (patch)
treecf3a8925d1776444195a85229e1479e51f9eb849 /activerecord/lib/active_record/attribute_methods/read.rb
parent254efb712ac10fd8e165fb34bb459f4abd59b213 (diff)
parentd24e6407a7f5d662cb52ed57efc4d8ee11758170 (diff)
downloadrails-9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb.tar.gz
rails-9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb.tar.bz2
rails-9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb.zip
Merge pull request #15592 from sgrif/sg-type-cast-from-database
Rename `type_cast` to `type_cast_from_database`
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/read.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods/read.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index ae3785638a..a354cd7503 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -123,9 +123,9 @@ module ActiveRecord
}
if self.class.cache_attribute?(name)
- @attributes[name] = column.type_cast(value)
+ @attributes[name] = column.type_cast_from_database(value)
else
- column.type_cast value
+ column.type_cast_from_database value
end
}
end