github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 16:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Honor Ruby's default calendar reform setting when creating DateTime objects via ActiveRecord's Time -> DateTime overflow, Time#time_with_datetime_fallback, Time#to_datetime, Date#to_datetime and String#to_datetime. Closes #10201

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Geoff Buesing
2007-11-24 04:59:21 +00:00
parent d84846a636
commit becdb49186
11 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* DateTimes use Ruby's default calendar reform setting. #10201 [Geoff Buesing]
* Dynamic finders on association collections respect association :order and :limit. #10211, #10227 [Patrick Joyce, Rick Olson, Jack Danger Canty]
* Add 'foxy' support for fixtures of polymorphic associations. #10183 [jbarnette, David Lowenfels]

3
activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
View File

@@ -174,8 +174,7 @@ module ActiveRecord
# Over/underflow to DateTime
rescue ArgumentError, TypeError
zone_offset = Base.default_timezone == :local ? DateTime.local_offset : 0
# Append zero calendar reform start to account for dates skipped by calendar reform
DateTime.new(year, mon, mday, hour, min, sec, zone_offset, 0) rescue nil
DateTime.civil(year, mon, mday, hour, min, sec, zone_offset) rescue nil
end
def fast_string_to_date(string)

3
activerecord/test/migration_test.rb
View File

@@ -286,7 +286,7 @@ if ActiveRecord::Base.connection.supports_migrations?
:bio => "I was born ....", :age => 18, :height => 1.78,
:wealth => BigDecimal.new("12345678901234567890.0123456789"),
:birthday => 18.years.ago, :favorite_day => 10.days.ago,
:moment_of_truth => "1582-10-10 21:40:18", :male => true
:moment_of_truth => "1782-10-10 21:40:18", :male => true
end
bob = Person.find(:first)
@@ -323,6 +323,7 @@ if ActiveRecord::Base.connection.supports_migrations?
assert_equal DateTime.now.offset, bob.moment_of_truth.offset
assert_not_equal 0, bob.moment_of_truth.offset
assert_not_equal "Z", bob.moment_of_truth.zone
assert_equal DateTime::ITALY, bob.moment_of_truth.start
end
assert_equal TrueClass, bob.male?.class

2
activesupport/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Time#time_with_datetime_fallback, Time#to_datetime, Date#to_datetime and String#to_datetime honor Ruby's default calendar reform setting. #10201 [Geoff Buesing]
* Change Time and DateTime #end_of_month to return last second of month instead of beginning of last day of month. Closes #10200 [Geoff Buesing]
* Speedup String#blank? [Jeremy Kemper, Koz]

2
activesupport/lib/active_support/core_ext/date/conversions.rb
View File

@@ -53,7 +53,7 @@ module ActiveSupport #:nodoc:
# Converts self to a Ruby DateTime object; time is set to beginning of day
def to_datetime
::DateTime.civil(year, month, day, 0, 0, 0, 0, 0)
::DateTime.civil(year, month, day, 0, 0, 0, 0)
end if RUBY_VERSION < '1.9'
def xmlschema

2
activesupport/lib/active_support/core_ext/string/conversions.rb
View File

@@ -15,7 +15,7 @@ module ActiveSupport #:nodoc:
end
def to_datetime
::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0 << 0)
::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0)
end
end
end

2
activesupport/lib/active_support/core_ext/time/calculations.rb
View File

@@ -36,7 +36,7 @@ module ActiveSupport #:nodoc:
::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
rescue
offset = utc_or_local.to_sym == :local ? ::DateTime.local_offset : 0
::DateTime.civil(year, month, day, hour, min, sec, offset, 0)
::DateTime.civil(year, month, day, hour, min, sec, offset)
end
# wraps class method time_with_datetime_fallback with utc_or_local == :utc

2
activesupport/lib/active_support/core_ext/time/conversions.rb
View File

@@ -43,7 +43,7 @@ module ActiveSupport #:nodoc:
# converts to a Ruby DateTime instance; preserves utc offset
def to_datetime
::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400), 0)
::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
end
end
end

2
activesupport/test/core_ext/date_ext_test.rb
View File

@@ -23,6 +23,8 @@ class DateExtCalculationsTest < Test::Unit::TestCase
def test_to_datetime
assert_equal DateTime.civil(2005, 2, 21), Date.new(2005, 2, 21).to_datetime
assert_equal 0, Date.new(2005, 2, 21).to_datetime.offset # use UTC offset
assert_equal ::Date::ITALY, Date.new(2005, 2, 21).to_datetime.start # use Ruby's default start value
end
def test_to_date

10
activesupport/test/core_ext/string_ext_test.rb
View File

@@ -83,8 +83,16 @@ class StringInflectionsTest < Test::Unit::TestCase
assert_equal Time.local(2005, 2, 27, 23, 50), "2005-02-27 23:50".to_time(:local)
assert_equal DateTime.civil(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time
assert_equal Time.local_time(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_time(:local)
assert_equal Date.new(2005, 2, 27), "2005-02-27".to_date
end
def test_string_to_datetime
assert_equal DateTime.civil(2039, 2, 27, 23, 50), "2039-02-27 23:50".to_datetime
assert_equal 0, "2039-02-27 23:50".to_datetime.offset # use UTC offset
assert_equal ::Date::ITALY, "2039-02-27 23:50".to_datetime.start # use Ruby's default start value
end
def test_string_to_date
assert_equal Date.new(2005, 2, 27), "2005-02-27".to_date
end
def test_access

2
activesupport/test/core_ext/time_ext_test.rb
View File

@@ -334,6 +334,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
with_timezone 'NZ' do
assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400), 0)
end
assert_equal ::Date::ITALY, Time.utc(2005, 2, 21, 17, 44, 30).to_datetime.start # use Ruby's default start value
end
def test_to_time
@@ -378,6 +379,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0, 0)
assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
assert_equal ::Date::ITALY, Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).start # use Ruby's default start value
end
def test_utc_time