From bbb8f518b53f1e9ef90c490f741e2eea0d993a17 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Tue, 12 Apr 2016 19:19:21 +0530 Subject: Include running mariadb on travis - Specify we want to run on latest stable ruby for mariadb - change in runs of builds Make mariadb? method publicly available --- .../active_record/connection_adapters/abstract_mysql_adapter.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record') 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 1797af4e97..6189e381bf 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 -- cgit v1.2.3