diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 14:47:27 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 14:47:27 -0200 |
commit | bb9d20cf3434e20ac6f275e3ad29be42ebec207f (patch) | |
tree | f1ca7e3bf8dcc817a0ea9cda31e11f3e6a402953 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
parent | f3186093d816675344c4f93c82c96fe8e94caafa (diff) | |
parent | cddc298deaf58a51dfa1938fba7b64052594bbe7 (diff) | |
download | rails-bb9d20cf3434e20ac6f275e3ad29be42ebec207f.tar.gz rails-bb9d20cf3434e20ac6f275e3ad29be42ebec207f.tar.bz2 rails-bb9d20cf3434e20ac6f275e3ad29be42ebec207f.zip |
Merge pull request #18914 from kamipo/format_time_according_to_precision
Format the time string according to the precision of the time column
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.rb | 15 |
1 files changed, 6 insertions, 9 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..8db4bcd7e3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -75,7 +75,7 @@ module ActiveRecord def prepare_column_options(column) spec = super - spec.delete(:precision) if column.type == :datetime && column.precision == 0 + spec.delete(:precision) if /time/ === column.sql_type && column.precision == 0 spec end @@ -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 @@ -736,7 +733,7 @@ module ActiveRecord end def extract_precision(sql_type) - if /datetime/ === sql_type + if /time/ === sql_type super || 0 else super |