3 files changed, 38 insertions, 13 deletions
diff --git a/activerecord/test/cases/database_statements_test.rb b/activerecord/test/cases/database_statements_test.rb
index c689e97d83..ba085991e0 100644
--- a/activerecord/test/cases/database_statements_test.rb
+++ b/activerecord/test/cases/database_statements_test.rb
@@ -6,14 +6,23 @@ class DatabaseStatementsTest < ActiveRecord::TestCase
   end
 
   def test_insert_should_return_the_inserted_id
+    assert_not_nil return_the_inserted_id(method: :insert)
+  end
+
+  def test_create_should_return_the_inserted_id
+    assert_not_nil return_the_inserted_id(method: :create)
+  end
+
+  private
+
+  def return_the_inserted_id(method:)
     # Oracle adapter uses prefetched primary key values from sequence and passes them to connection adapter insert method
     if current_adapter?(:OracleAdapter)
       sequence_name = "accounts_seq"
       id_value = @connection.next_sequence_value(sequence_name)
-      id = @connection.insert("INSERT INTO accounts (id, firm_id,credit_limit) VALUES (accounts_seq.nextval,42,5000)", nil, :id, id_value, sequence_name)
+      @connection.send(method, "INSERT INTO accounts (id, firm_id,credit_limit) VALUES (accounts_seq.nextval,42,5000)", nil, :id, id_value, sequence_name)
     else
-      id = @connection.insert("INSERT INTO accounts (firm_id,credit_limit) VALUES (42,5000)")
+      @connection.send(method, "INSERT INTO accounts (firm_id,credit_limit) VALUES (42,5000)")
     end
-    assert_not_nil id
   end
 end
diff --git a/activerecord/test/cases/migration/compatibility_test.rb b/activerecord/test/cases/migration/compatibility_test.rb
index 267d2fcccc..b1e1d72944 100644
--- a/activerecord/test/cases/migration/compatibility_test.rb
+++ b/activerecord/test/cases/migration/compatibility_test.rb
@@ -21,6 +21,7 @@ module ActiveRecord
       teardown do
         connection.drop_table :testings rescue nil
         ActiveRecord::Migration.verbose = @verbose_was
+        ActiveRecord::SchemaMigration.delete_all
       end
 
       def test_migration_doesnt_remove_named_index
@@ -37,6 +38,21 @@ module ActiveRecord
         assert_raise(StandardError) { ActiveRecord::Migrator.new(:up, [migration]).migrate }
         assert connection.index_exists?(:testings, :foo, name: "custom_index_name")
       end
+
+      def test_migration_does_remove_unnamed_index
+        connection.add_index :testings, :bar
+
+        migration = Class.new(ActiveRecord::Migration[4.2]) {
+          def version; 101 end
+          def migrate(x)
+            remove_index :testings, :bar
+          end
+        }.new
+
+        assert connection.index_exists?(:testings, :bar)
+        ActiveRecord::Migrator.new(:up, [migration]).migrate
+        assert_not connection.index_exists?(:testings, :bar)
+      end
     end
   end
 end
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index 9e1fe32c2d..752572a79c 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -2,18 +2,18 @@ ActiveRecord::Schema.define do
   create_table :binary_fields, force: true do |t|
     t.binary :var_binary, limit: 255
     t.binary :var_binary_large, limit: 4095
-    t.blob   :tiny_blob, limit: 255
-    t.binary :normal_blob, limit: 65535
-    t.binary :medium_blob, limit: 16777215
-    t.binary :long_blob, limit: 2147483647
-    t.text   :tiny_text, limit: 255
-    t.text   :normal_text, limit: 65535
-    t.text   :medium_text, limit: 16777215
-    t.text   :long_text, limit: 2147483647
+    t.tinyblob   :tiny_blob
+    t.blob       :normal_blob
+    t.mediumblob :medium_blob
+    t.longblob   :long_blob
+    t.tinytext   :tiny_text
+    t.text       :normal_text
+    t.mediumtext :medium_text
+    t.longtext   :long_text
+
+    t.index :var_binary
   end
 
-  add_index :binary_fields, :var_binary
-
   create_table :key_tests, force: true, :options => 'ENGINE=MyISAM' do |t|
     t.string :awesome
     t.string :pizza