From 649f2513a453cae319be8b63a9de25ae11fb9e8f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Nov 2011 10:00:33 -0800
Subject: Revert "Merge pull request #3603 from
 vijaydev/change_table_without_block_arg"

This reverts commit 81fad6a270ec3cbbb88553c9f2e8200c34fd4d13, reversing
changes made to 23101de283de13517e30c4c3d1ecc65525264886.

Conflicts:

	activerecord/test/cases/migration_test.rb
---
 activerecord/test/cases/migration_test.rb | 54 -------------------------------
 1 file changed, 54 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 75eb9c2bce..ae5b2a62b5 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1757,60 +1757,6 @@ if ActiveRecord::Base.connection.supports_migrations?
         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
-- 
cgit v1.2.3