1 files changed, 12 insertions, 19 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 cc820036ca..5900919e88 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -680,13 +680,13 @@ module ActiveRecord
 
           m.register_type(%r(enum)i) do |sql_type|
             limit = sql_type[/^enum\((.+)\)/i, 1]
-              .split(",").map{|enum| enum.strip.length - 2}.max
+              .split(",").map { |enum| enum.strip.length - 2 }.max
             MysqlString.new(limit: limit)
           end
 
           m.register_type(%r(^set)i) do |sql_type|
             limit = sql_type[/^set\((.+)\)/i, 1]
-              .split(",").map{|set| set.strip.length - 1}.sum - 1
+              .split(",").map { |set| set.strip.length - 1 }.sum - 1
             MysqlString.new(limit: limit)
           end
         end
@@ -713,32 +713,25 @@ module ActiveRecord
           MySQL::TypeMetadata.new(super(sql_type), extra: extra, strict: strict_mode?)
         end
 
-        def add_index_length(option_strings, column_names, options = {})
-          if options.is_a?(Hash) && length = options[:length]
+        def add_index_length(quoted_columns, **options)
+          if length = options[:length]
             case length
             when Hash
-              column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && length[name].present?}
+              quoted_columns.each { |name, column| column << "(#{length[name]})" if length[name].present? }
             when Integer
-              column_names.each {|name| option_strings[name] += "(#{length})"}
+              quoted_columns.each { |name, column| column << "(#{length})" }
             end
           end
 
-          return option_strings
+          quoted_columns
         end
 
-        def quoted_columns_for_index(column_names, options = {})
-          option_strings = Hash[column_names.map {|name| [name, ""]}]
-
-          # add index length
-          option_strings = add_index_length(option_strings, column_names, options)
-
-          # add index sort order
-          option_strings = add_index_sort_order(option_strings, column_names, options)
-
-          column_names.map {|name| quote_column_name(name) + option_strings[name]}
+        def add_options_for_index_columns(quoted_columns, **options)
+          quoted_columns = add_index_length(quoted_columns, options)
+          super
         end
 
-      # See https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html
+        # See https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html
         ER_DUP_ENTRY            = 1062
         ER_NO_REFERENCED_ROW_2  = 1452
         ER_DATA_TOO_LONG        = 1406
@@ -800,7 +793,7 @@ module ActiveRecord
         end
 
         def remove_columns_sql(table_name, *column_names)
-          column_names.map {|column_name| remove_column_sql(table_name, column_name) }
+          column_names.map { |column_name| remove_column_sql(table_name, column_name) }
         end
 
         def add_index_sql(table_name, column_name, options = {})