1 files changed, 75 insertions, 3 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index fa8dec0e15..f8afb7c591 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -239,9 +239,13 @@ class MigrationTest < ActiveRecord::TestCase
 
     assert_not Person.column_methods_hash.include?(:last_name)
 
-    migration = Struct.new(:name, :version) {
-      def migrate(x); raise 'Something broke'; end
-    }.new('zomg', 100)
+    migration = Class.new(ActiveRecord::Migration) {
+      def version; 100 end
+      def migrate(x)
+        add_column "people", "last_name", :string
+        raise 'Something broke'
+      end
+    }.new
 
     migrator = ActiveRecord::Migrator.new(:up, [migration], 100)
 
@@ -250,7 +254,39 @@ class MigrationTest < ActiveRecord::TestCase
     assert_equal "An error has occurred, this and all later migrations canceled:\n\nSomething broke", e.message
 
     Person.reset_column_information
+    assert_not Person.column_methods_hash.include?(:last_name),
+     "On error, the Migrator should revert schema changes but it did not."
+  end
+
+  def test_migration_without_transaction
+    unless ActiveRecord::Base.connection.supports_ddl_transactions?
+      skip "not supported on #{ActiveRecord::Base.connection.class}"
+    end
+
     assert_not Person.column_methods_hash.include?(:last_name)
+
+    migration = Class.new(ActiveRecord::Migration) {
+      self.disable_ddl_transaction!
+
+      def version; 101 end
+      def migrate(x)
+        add_column "people", "last_name", :string
+        raise 'Something broke'
+      end
+    }.new
+
+    migrator = ActiveRecord::Migrator.new(:up, [migration], 101)
+    e = assert_raise(StandardError) { migrator.migrate }
+    assert_equal "An error has occurred, all later migrations canceled:\n\nSomething broke", e.message
+
+    Person.reset_column_information
+    assert Person.column_methods_hash.include?(:last_name),
+     "without ddl transactions, the Migrator should not rollback on error but it did."
+  ensure
+    Person.reset_column_information
+    if Person.column_methods_hash.include?(:last_name)
+      Person.connection.remove_column('people', 'last_name')
+    end
   end
 
   def test_schema_migrations_table_name
@@ -426,6 +462,22 @@ class ReservedWordsMigrationTest < ActiveRecord::TestCase
   end
 end
 
+class ExplicitlyNamedIndexMigrationTest < ActiveRecord::TestCase
+  def test_drop_index_by_name
+    connection = Person.connection
+    connection.create_table :values, force: true do |t|
+      t.integer :value
+    end
+
+    assert_nothing_raised ArgumentError do
+      connection.add_index :values, :value, name: 'a_different_name'
+      connection.remove_index :values, column: :value, name: 'a_different_name'
+    end
+
+    connection.drop_table :values rescue nil
+  end
+end
+
 if ActiveRecord::Base.connection.supports_bulk_alter?
   class BulkAlterTableMigrationsTest < ActiveRecord::TestCase
     def setup
@@ -686,6 +738,26 @@ class CopyMigrationsTest < ActiveRecord::TestCase
     clear
   end
 
+  def test_copying_migrations_preserving_magic_comments
+    ActiveRecord::Base.timestamped_migrations = false
+    @migrations_path = MIGRATIONS_ROOT + "/valid"
+    @existing_migrations = Dir[@migrations_path + "/*.rb"]
+
+    copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/magic"})
+    assert File.exists?(@migrations_path + "/4_currencies_have_symbols.bukkits.rb")
+    assert_equal [@migrations_path + "/4_currencies_have_symbols.bukkits.rb"], copied.map(&:filename)
+
+    expected = "# coding: ISO-8859-15\n# This migration comes from bukkits (originally 1)"
+    assert_equal expected, IO.readlines(@migrations_path + "/4_currencies_have_symbols.bukkits.rb")[0..1].join.chomp
+
+    files_count = Dir[@migrations_path + "/*.rb"].length
+    copied = ActiveRecord::Migration.copy(@migrations_path, {:bukkits => MIGRATIONS_ROOT + "/magic"})
+    assert_equal files_count, Dir[@migrations_path + "/*.rb"].length
+    assert copied.empty?
+  ensure
+    clear
+  end
+
   def test_skipping_migrations
     @migrations_path = MIGRATIONS_ROOT + "/valid_with_timestamps"
     @existing_migrations = Dir[@migrations_path + "/*.rb"]