Permalink
Browse files

Merge pull request #7337 from adzap/string_to_dummy_time

Fix for time type columns with invalid time value
  • Loading branch information...
2 parents 9e0a14f + acf583a commit 91183baa6d54428da7ea466f0a854de2e631dd64 @rafaelfranca rafaelfranca committed Sep 5, 2012
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* Fix time column type casting for invalid time string values to correctly return nil.
+
+ *Adam Meehan*
+
* Allow to pass Symbol or Proc into :limit option of #accepts_nested_attributes_for
*Mikhail Dieterle*
@@ -178,7 +178,13 @@ def string_to_dummy_time(string)
return string unless string.is_a?(String)
return nil if string.blank?
- string_to_time "2000-01-01 #{string}"
+ dummy_time_string = "2000-01-01 #{string}"
+
+ fast_string_to_time(dummy_time_string) || begin
+ time_hash = Date._parse(dummy_time_string)
+ return nil if time_hash[:hour].nil?
+ new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction))
+ end
end
# convert something to a boolean
@@ -970,6 +970,18 @@ def test_attributes_on_dummy_time
assert_equal Time.local(2000, 1, 1, 5, 42, 0), topic.bonus_time
end
+ def test_attributes_on_dummy_time_with_invalid_time
+ # Oracle, and Sybase do not have a TIME datatype.
+ return true if current_adapter?(:OracleAdapter, :SybaseAdapter)
+
+ attributes = {
+ "bonus_time" => "not a time"
+ }
+ topic = Topic.find(1)
+ topic.attributes = attributes
+ assert_nil topic.bonus_time
+ end
+
def test_boolean
b_nil = Boolean.create({ "value" => nil })
nil_id = b_nil.id

0 comments on commit 91183ba

Please sign in to comment.