Permalink
Browse files

Revert "Merge pull request #3603 from vijaydev/change_table_without_b…

…lock_arg"

This reverts commit 81fad6a, reversing
changes made to 23101de.

Conflicts:

	activerecord/test/cases/migration_test.rb
  • Loading branch information...
1 parent d8b2b6a commit 649f2513a453cae319be8b63a9de25ae11fb9e8f @tenderlove tenderlove committed Nov 17, 2011
@@ -242,19 +242,14 @@ def create_table(table_name, options = {}, &blk)
#
# See also Table for details on
# all of the various column transformation
- def change_table(table_name, options = {}, &blk)
- bulk_change = supports_bulk_alter? && options[:bulk]
- recorder = bulk_change ? ActiveRecord::Migration::CommandRecorder.new(self) : self
- table = Table.new(table_name, recorder)
-
- if block_given?
- if blk.arity == 1
- yield table
- else
- table.instance_eval(&blk)
- end
+ def change_table(table_name, options = {})
+ if supports_bulk_alter? && options[:bulk]
+ recorder = ActiveRecord::Migration::CommandRecorder.new(self)
+ yield Table.new(table_name, recorder)
+ bulk_change_table(table_name, recorder.commands)
+ else
+ yield Table.new(table_name, self)
end
- bulk_change_table(table_name, recorder.commands) if bulk_change
end
# Renames a table.
@@ -1757,60 +1757,6 @@ def test_create_table_should_not_have_mixed_syntax
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

0 comments on commit 649f251

Please sign in to comment.