diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-06-24 15:13:35 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-06-24 15:13:35 +0200 |
| commit | 1a299f1df2f97e66779f37370bcc4306843a8390 (patch) | |
| tree | 741c649ed10528ba45324d0f1196ef1d115e0990 | |
| parent | 9ac1ce11ad9ec22157d2e542437c5c5cccaf58fe (diff) | |
| parent | 40e33ff9fc81f919b143576180b9202794a37e91 (diff) | |
| download | rails-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
| -rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 10 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index 833ffa158b..2887db3bf7 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -115,7 +115,7 @@ module ActiveRecord end class MultiparameterAttribute #:nodoc: - attr_reader :object, :name, :values, :column + attr_reader :object, :name, :values, :cast_type def initialize(object, name, values) @object = object @@ -126,8 +126,8 @@ module ActiveRecord def read_value return if values.values.compact.empty? - @column = object.column_for_attribute(name) - klass = column ? column.klass : nil + @cast_type = object.type_for_attribute(name) + klass = cast_type.klass if klass == Time read_time @@ -141,7 +141,7 @@ module ActiveRecord private def instantiate_time_object(set_values) - if object.class.send(:create_time_zone_conversion_attribute?, name, column) + if object.class.send(:create_time_zone_conversion_attribute?, name, cast_type) Time.zone.local(*set_values) else Time.send(object.class.default_timezone, *set_values) @@ -151,7 +151,7 @@ module ActiveRecord def read_time # If column is a :time (and not :date or :datetime) there is no need to validate if # there are year/month/day fields - if column.type == :time + if cast_type.type == :time # if the column is a time set the values to their defaults as January 1, 1970, but only if they're nil { 1 => 1970, 2 => 1, 3 => 1 }.each do |key,value| values[key] ||= value 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 |