diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-13 22:18:54 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-13 22:18:54 -0700 |
| commit | 128923ca14eeae032c2ed72b043e2bbcda09ab9c (patch) | |
| tree | d48c435be8261c2cb5e3a157ca551c2296204aa7 /activerecord/lib/active_record | |
| parent | ad87acf8b2eeeb2c2b54a436cff7924f9fb470a0 (diff) | |
| parent | bbb8f518b53f1e9ef90c490f741e2eea0d993a17 (diff) | |
| download | rails-128923ca14eeae032c2ed72b043e2bbcda09ab9c.tar.gz rails-128923ca14eeae032c2ed72b043e2bbcda09ab9c.tar.bz2 rails-128923ca14eeae032c2ed72b043e2bbcda09ab9c.zip | |
Merge pull request #24522 from vipulnsward/run-mariadb-on-travis
Test against MariaDB 10.0
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 8 |
1 files changed, 4 insertions, 4 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 330fb11895..8bd9da4fbc 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -81,6 +81,10 @@ module ActiveRecord @version ||= Version.new(full_version.match(/^\d+\.\d+\.\d+/)[0]) end + def mariadb? # :nodoc: + full_version =~ /mariadb/i + end + # Returns true, since this connection adapter supports migrations. def supports_migrations? true @@ -782,10 +786,6 @@ module ActiveRecord subselect.from subsubselect.as('__active_record_temp') end - def mariadb? - full_version =~ /mariadb/i - end - def supports_rename_index? mariadb? ? false : version >= '5.7.6' end |