aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-03-05 18:30:50 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-03-05 18:30:50 -0700
commitf7a1fcbd078fe001c7d219fe83e344d32ce539be (patch)
treea52b1c2b6b9bca1a0ea735329111c1883a5eeb66 /activerecord
parenta06fb60d1537e51022a22b35a389bab1beb76ea8 (diff)
parenta7d6aa389343ee258f19a4fe71869f7ebf3a6a4d (diff)
downloadrails-f7a1fcbd078fe001c7d219fe83e344d32ce539be.tar.gz
rails-f7a1fcbd078fe001c7d219fe83e344d32ce539be.tar.bz2
rails-f7a1fcbd078fe001c7d219fe83e344d32ce539be.zip
Merge pull request #24079 from y-yagi/chage_date_time_to_datetime
chage `date_time` type ` to `datetime`
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/type.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/type.rb b/activerecord/lib/active_record/type.rb
index e210e94f00..4911d93dd9 100644
--- a/activerecord/lib/active_record/type.rb
+++ b/activerecord/lib/active_record/type.rb
@@ -61,7 +61,7 @@ module ActiveRecord
register(:binary, Type::Binary, override: false)
register(:boolean, Type::Boolean, override: false)
register(:date, Type::Date, override: false)
- register(:date_time, Type::DateTime, override: false)
+ register(:datetime, Type::DateTime, override: false)
register(:decimal, Type::Decimal, override: false)
register(:float, Type::Float, override: false)
register(:integer, Type::Integer, override: false)