diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-03-15 11:59:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 11:59:47 +0000 |
| commit | 8fc2b519d601e9d39e611d82f53361bbfc28a132 (patch) | |
| tree | b30e4d2e9931cb1711c07f6d27807b4eb4c84873 /activemodel/lib | |
| parent | 2d2da1861576a3900a295dc3950b447027f9ed9d (diff) | |
| parent | 7c479cbf6211d7efadc0a9573cf82c05291f7ef1 (diff) | |
| download | rails-8fc2b519d601e9d39e611d82f53361bbfc28a132.tar.gz rails-8fc2b519d601e9d39e611d82f53361bbfc28a132.tar.bz2 rails-8fc2b519d601e9d39e611d82f53361bbfc28a132.zip | |
Merge pull request #32220 from rails/fix-time-columns-on-sqlite3
Time column improvements
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/type/time.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/type/time.rb b/activemodel/lib/active_model/type/time.rb index ad7ba0351a..c094ee0013 100644 --- a/activemodel/lib/active_model/type/time.rb +++ b/activemodel/lib/active_model/type/time.rb @@ -28,14 +28,10 @@ module ActiveModel private def cast_value(value) - return value unless value.is_a?(::String) + return apply_seconds_precision(value) unless value.is_a?(::String) return if value.empty? - if value.start_with?("2000-01-01") - dummy_time_value = value - else - dummy_time_value = "2000-01-01 #{value}" - end + dummy_time_value = value.sub(/\A(\d\d\d\d-\d\d-\d\d |)/, "2000-01-01 ") fast_string_to_time(dummy_time_value) || begin time_hash = ::Date._parse(dummy_time_value) |