diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-06-24 06:43:03 -0600 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-06-24 07:11:54 -0600 |
commit | 40e33ff9fc81f919b143576180b9202794a37e91 (patch) | |
tree | 741c649ed10528ba45324d0f1196ef1d115e0990 /activerecord/lib/active_record/attribute_methods | |
parent | 9ac1ce11ad9ec22157d2e542437c5c5cccaf58fe (diff) | |
download | rails-40e33ff9fc81f919b143576180b9202794a37e91.tar.gz rails-40e33ff9fc81f919b143576180b9202794a37e91.tar.bz2 rails-40e33ff9fc81f919b143576180b9202794a37e91.zip |
Silence warning in test
We still had one file using `column_for_attribute` when it could return
nil, causing deprecation warnings in the tests.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index 188d5d2aab..5f1dc8bc9f 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -42,10 +42,10 @@ module ActiveRecord module ClassMethods private - def create_time_zone_conversion_attribute?(name, column) + def create_time_zone_conversion_attribute?(name, cast_type) time_zone_aware_attributes && !self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) && - (:datetime == column.type) + (:datetime == cast_type.type) end end end |