aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/type
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2015-01-03 02:03:47 +0300
committerbrainopia <brainopia@evilmartians.com>2015-01-03 02:03:47 +0300
commite8d6ba218ac019591f1d68f4f54d4243b606893c (patch)
treed46763f1864c43a1ea3cebccfc09204b19dd774c /activerecord/lib/active_record/type
parent78dab2a8569408658542e462a957ea5a35aa4679 (diff)
downloadrails-e8d6ba218ac019591f1d68f4f54d4243b606893c.tar.gz
rails-e8d6ba218ac019591f1d68f4f54d4243b606893c.tar.bz2
rails-e8d6ba218ac019591f1d68f4f54d4243b606893c.zip
Support datetime values in AR::Type::DateTime#type_cast_for_database
Diffstat (limited to 'activerecord/lib/active_record/type')
-rw-r--r--activerecord/lib/active_record/type/date_time.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/type/date_time.rb b/activerecord/lib/active_record/type/date_time.rb
index 5f19608a33..0a737815bc 100644
--- a/activerecord/lib/active_record/type/date_time.rb
+++ b/activerecord/lib/active_record/type/date_time.rb
@@ -11,7 +11,11 @@ module ActiveRecord
zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
if value.acts_like?(:time)
- value.send(zone_conversion_method)
+ if value.respond_to?(zone_conversion_method)
+ value.send(zone_conversion_method)
+ else
+ value
+ end
else
super
end