diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-28 17:30:17 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-28 17:30:17 +0000 |
commit | 60de8c110829cb7f2df1d312ad2898633e896c24 (patch) | |
tree | cc6fafcc057c94bbda035f3277324a24368a418c /activerecord/lib/active_record/connection_adapters | |
parent | 8a9b998b7960ba171d77cc11bb4f4c318a05ac46 (diff) | |
download | rails-60de8c110829cb7f2df1d312ad2898633e896c24.tar.gz rails-60de8c110829cb7f2df1d312ad2898633e896c24.tar.bz2 rails-60de8c110829cb7f2df1d312ad2898633e896c24.zip |
Added Base.default_timezone accessor that determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates and times from the database. This is set to :local by default.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@271 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 1ca6d59977..454fe98e7f 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -220,21 +220,21 @@ module ActiveRecord return string if Time === string time_array = ParseDate.parsedate(string).compact # treat 0000-00-00 00:00:00 as nil - Time.local(*time_array) rescue nil + Time.send(Base.default_timezone, *time_array) rescue nil end - def string_to_dummy_time(string) - return string if Time === string - time_array = ParseDate.parsedate(string) - # pad the resulting array with dummy date information - time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1; - Time.local(*time_array) rescue nil - end - + def string_to_dummy_time(string) + return string if Time === string + time_array = ParseDate.parsedate(string) + # pad the resulting array with dummy date information + time_array[0] = 2000; time_array[1] = 1; time_array[2] = 1; + Time.send(Base.default_timezone, *time_array) rescue nil + end + def extract_limit(sql_type) $1.to_i if sql_type =~ /\((.*)\)/ end - + def simplified_type(field_type) case field_type when /int/i |