make sure the migration table is alive and empty

2 files changed, 12 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb
index 20e3cbb1f6..257963c2ce 100644
--- a/activerecord/lib/active_record/schema_migration.rb
+++ b/activerecord/lib/active_record/schema_migration.rb
@@ -20,8 +20,7 @@ module ActiveRecord
 
     def self.drop_table
       if connection.table_exists?(table_name)
-        connection.remove_index table_name, :version, :unique => true,
-          :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
+        connection.remove_index table_name, :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
         connection.drop_table(table_name)
       end
     end
diff --git a/activerecord/test/cases/migration/logger_test.rb b/activerecord/test/cases/migration/logger_test.rb
index c12cdd5043..2a0b4f5598 100644
--- a/activerecord/test/cases/migration/logger_test.rb
+++ b/activerecord/test/cases/migration/logger_test.rb
@@ -9,6 +9,17 @@ module ActiveRecord
         end
       end
 
+      def setup
+        super
+        ActiveRecord::SchemaMigration.create_table
+        ActiveRecord::SchemaMigration.delete_all
+      end
+
+      def teardown
+        super
+        ActiveRecord::SchemaMigration.drop_table
+      end
+
       def test_migration_should_be_run_without_logger
         previous_logger = ActiveRecord::Base.logger
         ActiveRecord::Base.logger = nil