diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 14:29:34 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-25 14:29:34 -0800 |
| commit | 0a7ba19dcc2271ad6183041ca79e8766a0d2bc40 (patch) | |
| tree | e993fe9626595504f388f4f3d8dd48c17a7faf94 /activerecord/lib/active_record | |
| parent | e95b9d6c68b1e0bba3840d18fc0aa94ccf88776d (diff) | |
| parent | fc4e387d7a478f75cdd4375b6c62e918b4b132b0 (diff) | |
| download | rails-0a7ba19dcc2271ad6183041ca79e8766a0d2bc40.tar.gz rails-0a7ba19dcc2271ad6183041ca79e8766a0d2bc40.tar.bz2 rails-0a7ba19dcc2271ad6183041ca79e8766a0d2bc40.zip | |
Merge pull request #8311 from alisdair/dirty-nullable-datetime
Don't call will_change! for datetime nil->"".
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 1 |
1 files changed, 1 insertions, 0 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 427c61079a..47a8b576c0 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -34,6 +34,7 @@ module ActiveRecord if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name]) method_body, line = <<-EOV, __LINE__ + 1 def #{attr_name}=(original_time) + original_time = nil if original_time.blank? time = original_time unless time.acts_like?(:time) time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time |