diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-05 06:26:53 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-05 10:47:52 -0300 |
commit | 5054e266ac07da7a2a15173d3d2919948ae1eb6e (patch) | |
tree | d08c6bffda7d10b6e7878e84adbb754cce5947a4 /activerecord/lib/active_record/connection_adapters/column.rb | |
parent | 87ac5b42b1ab05f2e72eb4c702742decdceed7c1 (diff) | |
download | rails-5054e266ac07da7a2a15173d3d2919948ae1eb6e.tar.gz rails-5054e266ac07da7a2a15173d3d2919948ae1eb6e.tar.bz2 rails-5054e266ac07da7a2a15173d3d2919948ae1eb6e.zip |
Merge pull request #7337 from adzap/string_to_dummy_time
Fix for time type columns with invalid time value
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/column.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index 393a3b623a..ef8ee6cab0 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -150,7 +150,13 @@ module ActiveRecord 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 |