aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-06-24 15:13:35 +0200
committerYves Senn <yves.senn@gmail.com>2014-06-24 15:13:35 +0200
commit1a299f1df2f97e66779f37370bcc4306843a8390 (patch)
tree741c649ed10528ba45324d0f1196ef1d115e0990 /activerecord/lib/active_record/attribute_methods
parent9ac1ce11ad9ec22157d2e542437c5c5cccaf58fe (diff)
parent40e33ff9fc81f919b143576180b9202794a37e91 (diff)
downloadrails-1a299f1df2f97e66779f37370bcc4306843a8390.tar.gz
rails-1a299f1df2f97e66779f37370bcc4306843a8390.tar.bz2
rails-1a299f1df2f97e66779f37370bcc4306843a8390.zip
Merge pull request #15894 from sgrif/sg-silence-warning-in-test
Silence warning in test
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r--activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb4
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