Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #7337 from adzap/string_to_dummy_time

Fix for time type columns with invalid time value
Conflicts:
	activerecord/CHANGELOG.md
  • Loading branch information...
commit 5054e266ac07da7a2a15173d3d2919948ae1eb6e 1 parent 87ac5b4
@rafaelfranca rafaelfranca authored
View
4 activerecord/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 3.2.9 (unreleased)
+* Fix time column type casting for invalid time string values to correctly return nil.
+
+ *Adam Meehan*
+
* Fix `becomes` when using a configured `inheritance_column`.
*Yves Senn*
View
8 activerecord/lib/active_record/connection_adapters/column.rb
@@ -150,7 +150,13 @@ def string_to_dummy_time(string)
return string unless string.is_a?(String)
return nil if string.empty?
- 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
View
12 activerecord/test/cases/base_test.rb
@@ -919,6 +919,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
Please sign in to comment.
Something went wrong with that request. Please try again.