1 files changed, 69 insertions, 0 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e8ad37d437..d6c7edc461 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1742,6 +1742,75 @@ if ActiveRecord::Base.connection.supports_migrations?
     ensure
       Person.connection.drop_table :testings rescue nil
     end
+
+    def test_create_table_should_not_have_mixed_syntax
+      assert_raise(NoMethodError) do
+        Person.connection.create_table :testings, :force => true do |t|
+          t.string :foo
+          integer :bar
+        end
+      end
+      assert_raise(NameError) do
+        Person.connection.create_table :testings, :force => true do
+          t.string :foo
+          integer :bar
+        end
+      end
+    end
+
+    def test_change_table_without_block_parameter_no_bulk
+      Person.connection.create_table :testings, :force => true do
+        string :foo
+      end
+      assert Person.connection.column_exists?(:testings, :foo, :string)
+
+      Person.connection.change_table :testings do
+        remove :foo
+        integer :bar
+      end
+
+      assert_equal %w(bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
+    if ActiveRecord::Base.connection.supports_bulk_alter?
+      def test_change_table_without_block_parameter_with_bulk
+        Person.connection.create_table :testings, :force => true do
+          string :foo
+        end
+        assert Person.connection.column_exists?(:testings, :foo, :string)
+
+        assert_queries(1) do
+          Person.connection.change_table(:testings, :bulk => true) do
+            integer :bar
+            string :foo_bar
+          end
+        end
+
+        assert_equal %w(bar foo foo_bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
+      ensure
+        Person.connection.drop_table :testings rescue nil
+      end
+    end
+
+    def test_change_table_should_not_have_mixed_syntax
+      Person.connection.create_table :testings, :force => true do
+        string :foo
+      end
+      assert_raise(NoMethodError) do
+        Person.connection.change_table :testings do |t|
+          t.remove :foo
+          integer :bar
+        end
+      end
+      assert_raise(NameError) do
+        Person.connection.change_table :testings do
+          t.remove :foo
+          integer :bar
+        end
+      end
+    end
   end # SexierMigrationsTest
 
   class MigrationLoggerTest < ActiveRecord::TestCase