diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-08 18:41:41 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-08 18:41:41 -0700 |
| commit | f0f16f72e3d053f52bc8a88e1d3181c5c3010622 (patch) | |
| tree | 380c23022da47d364f942a285eeeab31cae96890 /activerecord/lib | |
| parent | 2080ff2872e9604155a276a830b38844dc45c3b4 (diff) | |
| parent | 2224d06cfade0e0142e834ef1aa7a93881ccf3e4 (diff) | |
| download | rails-f0f16f72e3d053f52bc8a88e1d3181c5c3010622.tar.gz rails-f0f16f72e3d053f52bc8a88e1d3181c5c3010622.tar.bz2 rails-f0f16f72e3d053f52bc8a88e1d3181c5c3010622.zip | |
Merge pull request #24475 from jeremy/ar/mariadb-supports-datetime-precision
MariaDB 5.3+ supports microsecond datetime precision
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 6 |
1 files changed, 5 insertions, 1 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 42d3c68970..1797af4e97 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -121,7 +121,11 @@ module ActiveRecord end def supports_datetime_with_precision? - version >= '5.6.4' + if mariadb? + version >= '5.3.0' + else + version >= '5.6.4' + end end def supports_advisory_locks? |