Commits

Anonymous committed 889345b Merge

Merge branch 'master' of https://github.com/rails/rails

  • Participants
  • Parent commits a7898a9, d5141f2

Comments (0)

Files changed (3)

File activesupport/CHANGELOG.md

 ## Rails 4.0.0 (unreleased) ##
 
+*   Prevent `DateTime#change` from truncating the second fraction, when seconds
+    do not need to be changed.
+
+    *Chris Baynes*
+
 *   Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.
 
     Before this change:

File activesupport/lib/active_support/core_ext/date_time/calculations.rb

       options.fetch(:day, day),
       options.fetch(:hour, hour),
       options.fetch(:min, options[:hour] ? 0 : min),
-      options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec),
+      options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec + sec_fraction),
       options.fetch(:offset, offset),
       options.fetch(:start, start)
     )

File activesupport/test/core_ext/date_time_ext_test.rb

     assert_equal DateTime.civil(2005,2,22,16),       DateTime.civil(2005,2,22,15,15,10).change(:hour => 16)
     assert_equal DateTime.civil(2005,2,22,16,45),    DateTime.civil(2005,2,22,15,15,10).change(:hour => 16, :min => 45)
     assert_equal DateTime.civil(2005,2,22,15,45),    DateTime.civil(2005,2,22,15,15,10).change(:min => 45)
+
+    # datetime with fractions of a second
+    assert_equal DateTime.civil(2005,2,1,15,15,10.7), DateTime.civil(2005,2,22,15,15,10.7).change(:day => 1)
   end
 
   def test_advance