diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 16:49:26 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 16:49:26 -0300 |
| commit | 9664661f7b8e916ab2cf3fee1b2d2d2f0b26ceeb (patch) | |
| tree | cf3a8925d1776444195a85229e1479e51f9eb849 /activerecord/lib/active_record/relation | |
| parent | 254efb712ac10fd8e165fb34bb459f4abd59b213 (diff) | |
| parent | d24e6407a7f5d662cb52ed57efc4d8ee11758170 (diff) | |
| download | rails-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/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 11ab1b4595..38970a66ae 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -179,7 +179,7 @@ module ActiveRecord result = result.map do |attributes| values = attributes.values - columns.zip(values).map { |column, value| column.type_cast value } + columns.zip(values).map { |column, value| column.type_cast_from_database value } end columns.one? ? result.map!(&:first) : result end @@ -379,7 +379,7 @@ module ActiveRecord end def type_cast_using_column(value, column) - column ? column.type_cast(value) : value + column ? column.type_cast_from_database(value) : value end # TODO: refactor to allow non-string `select_values` (eg. Arel nodes). |