Revert "Merge pull request rails#1163 from amatsuda/sexier_migration_31"

This reverts commit 0e407a9, reversing
changes made to 533a9f8.

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/migration_test.rb

Author: tenderlove

activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -155,17 +155,11 @@ def column_exists?(table_name, column_name, type = nil, options = {})
       #  )
       #
       # See also TableDefinition#column for details on how to create columns.
-      def create_table(table_name, options = {}, &blk)
+      def create_table(table_name, options = {})
         td = table_definition
         td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
-        if block_given?
-          if blk.arity == 1
-            yield td
-          else
-            td.instance_eval(&blk)
-          end
-        end
+        yield td if block_given?
 
         if options[:force] && table_exists?(table_name)
           drop_table(table_name)

activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -480,30 +480,28 @@ def move_table(from, to, options = {}, &block) #:nodoc:
           drop_table(from)
         end
 
-        def copy_table(from, to, options = {}, &block) #:nodoc:
-          from_columns, from_primary_key = columns(from), primary_key(from)
-          options = options.merge(:id => (!from_columns.detect {|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
-          table_definition = nil
+        def copy_table(from, to, options = {}) #:nodoc:
+          options = options.merge(:id => (!columns(from).detect{|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
           create_table(to, options) do |definition|
-            table_definition = definition
-            from_columns.each do |column|
+            @definition = definition
+            columns(from).each do |column|
               column_name = options[:rename] ?
                 (options[:rename][column.name] ||
                  options[:rename][column.name.to_sym] ||
                  column.name) : column.name
 
-              table_definition.column(column_name, column.type,
+              @definition.column(column_name, column.type,
                 :limit => column.limit, :default => column.default,
                 :precision => column.precision, :scale => column.scale,
                 :null => column.null)
             end
-            table_definition.primary_key from_primary_key if from_primary_key
-            table_definition.instance_eval(&block) if block
+            @definition.primary_key(primary_key(from)) if primary_key(from)
+            yield @definition if block_given?
           end
 
           copy_table_indexes(from, to, options[:rename] || {})
           copy_table_contents(from, to,
-            table_definition.columns.map {|column| column.name},
+            @definition.columns.map {|column| column.name},
             options[:rename] || {})
         end
 

activerecord/lib/active_record/session_store.rb

@@ -64,13 +64,12 @@ def drop_table!
       end
 
       def create_table!
-        id_col_name, data_col_name = session_id_column, data_column_name
         connection_pool.clear_table_cache!(table_name)
         connection.create_table(table_name) do |t|
-          t.string id_col_name, :limit => 255
-          t.text data_col_name
+          t.string session_id_column, :limit => 255
+          t.text data_column_name
         end
-        connection.add_index table_name, id_col_name, :unique => true
+        connection.add_index table_name, session_id_column, :unique => true
       end
     end
 

activerecord/test/cases/migration_test.rb

@@ -1639,126 +1639,6 @@ def with_env_tz(new_tz = 'US/Eastern')
 
   end
 
-  class SexyMigrationsTest < ActiveRecord::TestCase
-    def test_references_column_type_adds_id
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.references :customer
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_adds_type
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {})
-        t.expects(:column).with('taggable_id', :integer, {})
-        t.references :taggable, :polymorphic => true
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {:null => false})
-        t.expects(:column).with('taggable_id', :integer, {:null => false})
-        t.references :taggable, :polymorphic => true, :null => false
-      end
-    end
-
-    def test_belongs_to_works_like_references
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.belongs_to :customer
-      end
-    end
-
-    def test_timestamps_creates_updated_at_and_created_at
-      with_new_table do |t|
-        t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
-        t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
-        t.timestamps
-      end
-    end
-
-    def test_integer_creates_integer_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'integer', {})
-        t.expects(:column).with(:bar, 'integer', {})
-        t.integer :foo, :bar
-      end
-    end
-
-    def test_string_creates_string_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'string', {})
-        t.expects(:column).with(:bar, 'string', {})
-        t.string :foo, :bar
-      end
-    end
-
-    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLite3Adapter) || current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
-      def test_xml_creates_xml_column
-        type = current_adapter?(:PostgreSQLAdapter) ? 'xml' : :text
-
-        with_new_table do |t|
-          t.expects(:column).with(:data, type, {})
-          t.xml :data
-        end
-      end
-    else
-      def test_xml_creates_xml_column
-        with_new_table do |t|
-          assert_raises(NotImplementedError) do
-            t.xml :data
-          end
-        end
-      end
-    end
-
-    protected
-    def with_new_table
-      Person.connection.create_table :delete_me, :force => true do |t|
-        yield t
-      end
-    ensure
-      Person.connection.drop_table :delete_me rescue nil
-    end
-
-  end # SexyMigrationsTest
-
-  class SexierMigrationsTest < ActiveRecord::TestCase
-    def test_create_table_with_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        column :foo, :string
-      end
-      assert Person.connection.column_exists?(:testings, :foo, :string)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_create_table_with_sexy_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        integer :bar
-      end
-      assert Person.connection.column_exists?(:testings, :bar, :integer)
-    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
-  end # SexierMigrationsTest
-
   class MigrationLoggerTest < ActiveRecord::TestCase
     def test_migration_should_be_run_without_logger
       previous_logger = ActiveRecord::Base.logger