Use `utf8mb4` charset for internal tables if the row format `DYNAMIC` by default

The indexing issue on `utf8mb4` columns is resolved since MySQL 5.7.9.

1 files changed, 1 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 2d7f34ef24..dbc6614b93 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -116,14 +116,6 @@ module ActiveRecord
         true
       end
 
-      def supports_longer_index_key_prefix?
-        if mariadb?
-          version >= "10.2.2"
-        else
-          version >= "5.7.9"
-        end
-      end
-
       def get_advisory_lock(lock_name, timeout = 0) # :nodoc:
         query_value("SELECT GET_LOCK(#{quote(lock_name.to_s)}, #{timeout})") == 1
       end
@@ -250,7 +242,7 @@ module ActiveRecord
           execute "CREATE DATABASE #{quote_table_name(name)} DEFAULT COLLATE #{quote_table_name(options[:collation])}"
         elsif options[:charset]
           execute "CREATE DATABASE #{quote_table_name(name)} DEFAULT CHARACTER SET #{quote_table_name(options[:charset])}"
-        elsif supports_longer_index_key_prefix?
+        elsif row_format_dynamic_by_default?
           execute "CREATE DATABASE #{quote_table_name(name)} DEFAULT CHARACTER SET `utf8mb4`"
         else
           raise "Configure a supported :charset and ensure innodb_large_prefix is enabled to support indexes on varchar(255) string columns."