diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-08-05 14:52:07 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-08-05 14:52:07 -0300 |
commit | ae175a5354321fd64393b9e1f4080437ee3cdf74 (patch) | |
tree | 43a858b6f5c88ff418c97274f34abe833ff490ce /activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | |
parent | f8eb4434d61fc1585c9b88dbb2d9159ea1f5b2fa (diff) | |
parent | cfd421daa2b04216e27d666361eb4053020e027d (diff) | |
download | rails-ae175a5354321fd64393b9e1f4080437ee3cdf74.tar.gz rails-ae175a5354321fd64393b9e1f4080437ee3cdf74.tar.bz2 rails-ae175a5354321fd64393b9e1f4080437ee3cdf74.zip |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/quoting.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/quoting.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb index 720fba29e9..8649f96498 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb @@ -60,7 +60,12 @@ module ActiveRecord end def quoted_date(value) - value.to_s(:db) + if value.acts_like?(:time) + zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal + value.respond_to?(zone_conversion_method) ? value.send(zone_conversion_method) : value + else + value + end.to_s(:db) end def quoted_string_prefix |