2 files changed, 30 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
index 978c8af02f..273ef978bf 100644
--- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
@@ -35,6 +35,18 @@ class ActiveSchemaTest < ActiveRecord::TestCase
 
     expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` ON `people` (`last_name`(15), `first_name`(10))"
     assert_equal expected, add_index(:people, [:last_name, :first_name], :length => {:last_name => 15, :first_name => 10})
+
+    %w(btree hash).each do |type|
+      expected = "CREATE  INDEX `index_people_on_last_name` USING #{type} ON `people` (`last_name`)"
+      assert_equal expected, add_index(:people, :last_name, :using => type)
+    end
+
+    expected = "CREATE  INDEX `index_people_on_last_name` USING btree ON `people` (`last_name`(10))"
+    assert_equal expected, add_index(:people, :last_name, :length => 10, :using => :btree)
+
+    expected = "CREATE  INDEX `index_people_on_last_name_and_first_name` USING btree ON `people` (`last_name`(15), `first_name`(15))"
+    assert_equal expected, add_index(:people, [:last_name, :first_name], :length => 15, :using => :btree)
+
     ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:remove_method, :index_name_exists?)
   end
 
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 94429e772f..78f754d2ce 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -44,6 +44,24 @@ module ActiveRecord
         assert_match(/database 'foo-bar'/, e.inspect)
       end
 
+      def test_dump_indexes
+        index_a_name = 'index_post_title'
+        index_b_name = 'index_post_body'
+
+        table = Post.table_name
+
+        @connection.execute "CREATE INDEX `#{index_a_name}` ON `#{table}` (`title`);"
+        @connection.execute "CREATE INDEX `#{index_b_name}` USING btree ON `#{table}` (`body`(10));"
+
+        indexes = @connection.indexes(table).sort_by {|i| i.name}
+        assert_equal 2,indexes.size
+
+        assert_equal :btree, indexes.select{|i| i.name == index_a_name}[0].using
+        assert_equal :btree, indexes.select{|i| i.name == index_b_name}[0].using
+
+        @connection.execute "DROP INDEX `#{index_a_name}` ON `#{table}`;"
+        @connection.execute "DROP INDEX `#{index_b_name}` ON `#{table}`;"
+      end
     end
   end
 end