aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-02-10 09:04:47 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-02-20 10:24:08 +0900
commit9ef870c0426f573355a10b04fd9740550492cd00 (patch)
tree47ae1320dbac2fa5a1c4ba903c006734704f13ba /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parent9a476b8cd6724699027eb00ec7ffa8b232d1b734 (diff)
downloadrails-9ef870c0426f573355a10b04fd9740550492cd00.tar.gz
rails-9ef870c0426f573355a10b04fd9740550492cd00.tar.bz2
rails-9ef870c0426f573355a10b04fd9740550492cd00.zip
Allow `:precision` option for time type columns
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 0a1c66be1e..c11f0c93b4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -251,6 +251,10 @@ module ActiveRecord
version[0] >= 5
end
+ def supports_datetime_with_precision?
+ (version[0] == 5 && version[1] >= 6) || version[0] >= 6
+ end
+
def native_database_types
NATIVE_DATABASE_TYPES
end
@@ -623,13 +627,6 @@ module ActiveRecord
when 0x1000000..0xffffffff; 'longtext'
else raise(ActiveRecordError, "No text type has character length #{limit}")
end
- when 'datetime'
- return super unless precision
-
- case precision
- when 0..6; "datetime(#{precision})"
- else raise(ActiveRecordError, "No datetime type has precision of #{precision}. The allowed range of precision is from 0 to 6.")
- end
else
super
end