diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-05-20 14:07:58 -0700 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-05-20 14:07:58 -0700 |
commit | 8f387995054d9ce79522da8ef65fba28c6ea0785 (patch) | |
tree | 53d38918ff2ccbb11dd503d56108e21df031646c /activerecord/lib/active_record/connection_adapters/type/time.rb | |
parent | 25c672637206a2c48fd829c58596c788b6e31c5d (diff) | |
download | rails-8f387995054d9ce79522da8ef65fba28c6ea0785.tar.gz rails-8f387995054d9ce79522da8ef65fba28c6ea0785.tar.bz2 rails-8f387995054d9ce79522da8ef65fba28c6ea0785.zip |
Inline typecasting helpers from Column to the appropriate types
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/type/time.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/type/time.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/type/time.rb b/activerecord/lib/active_record/connection_adapters/type/time.rb index b621e8f39c..4dd201e3fe 100644 --- a/activerecord/lib/active_record/connection_adapters/type/time.rb +++ b/activerecord/lib/active_record/connection_adapters/type/time.rb @@ -11,7 +11,16 @@ module ActiveRecord private def cast_value(value) - Column.string_to_dummy_time(value) + return value unless value.is_a?(::String) + return if value.empty? + + dummy_time_value = "2000-01-01 #{value}" + + fast_string_to_time(dummy_time_value) || begin + time_hash = ::Date._parse(dummy_time_value) + return if time_hash[:hour].nil? + new_time(*time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction)) + end end end end |