diff options
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/column.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index 25a9cdafcf..11b2e728e1 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -132,6 +132,8 @@ module ActiveRecord end class << self + include Type::TimeValue + # Used to convert from BLOBs to Strings def binary_to_string(value) value @@ -215,21 +217,6 @@ module ActiveRecord end end - def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil) - # Treat 0000-00-00 00:00:00 as nil. - return nil if year.nil? || (year == 0 && mon == 0 && mday == 0) - - if offset - time = Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil - return nil unless time - - time -= offset - Base.default_timezone == :utc ? time : time.getlocal - else - Time.public_send(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil - end - end - def fast_string_to_date(string) if string =~ Format::ISO_DATE new_date $1.to_i, $2.to_i, $3.to_i |