3 files changed, 125 insertions, 17 deletions
diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb
index e60fe876bb..040445ef12 100644
--- a/activerecord/test/cases/migration/column_attributes_test.rb
+++ b/activerecord/test/cases/migration/column_attributes_test.rb
@@ -1,29 +1,47 @@
-require "cases/helper"
+require "cases/migration/helper"
 
 module ActiveRecord
   class Migration
     class ColumnAttributesTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
       self.use_transactional_fixtures = false
 
-      class TestModel < ActiveRecord::Base
-        self.table_name = 'test_models'
+      def test_add_remove_single_field_using_string_arguments
+        refute TestModel.column_methods_hash.key?(:last_name)
+
+        add_column 'test_models', 'last_name', :string
+
+        TestModel.reset_column_information
+
+        assert TestModel.column_methods_hash.key?(:last_name)
+
+        remove_column 'test_models', 'last_name'
+
+        TestModel.reset_column_information
+        refute TestModel.column_methods_hash.key?(:last_name)
       end
 
-      attr_reader :connection, :table_name
+      def test_add_remove_single_field_using_symbol_arguments
+        refute TestModel.column_methods_hash.key?(:last_name)
 
-      def setup
-        super
-        @connection = ActiveRecord::Base.connection
-        connection.create_table :test_models do |t|
-          t.timestamps
-        end
+        add_column :test_models, :last_name, :string
+
+        TestModel.reset_column_information
+        assert TestModel.column_methods_hash.key?(:last_name)
+
+        remove_column :test_models, :last_name
 
         TestModel.reset_column_information
+        refute TestModel.column_methods_hash.key?(:last_name)
       end
 
-      def teardown
-        super
-        connection.drop_table :test_models rescue nil
+      def test_unabstracted_database_dependent_types
+        skip "not supported" unless current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+
+        add_column :test_models, :intelligence_quotient, :tinyint
+        TestModel.reset_column_information
+        assert_match(/tinyint/, TestModel.columns_hash['intelligence_quotient'].sql_type)
       end
 
       # We specifically do a manual INSERT here, and then test only the SELECT
@@ -165,10 +183,6 @@ module ActiveRecord
         assert_instance_of TrueClass, bob.male?
         assert_kind_of BigDecimal, bob.wealth
       end
-
-      def add_column(*args)
-        connection.add_column(*args)
-      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration/helper.rb b/activerecord/test/cases/migration/helper.rb
new file mode 100644
index 0000000000..cb8ead0835
--- /dev/null
+++ b/activerecord/test/cases/migration/helper.rb
@@ -0,0 +1,41 @@
+require "cases/helper"
+
+module ActiveRecord
+  class Migration
+    module TestHelper
+      attr_reader :connection, :table_name
+
+      class TestModel < ActiveRecord::Base
+        self.table_name = 'test_models'
+      end
+
+      def setup
+        super
+        @connection = ActiveRecord::Base.connection
+        connection.create_table :test_models do |t|
+          t.timestamps
+        end
+
+        TestModel.reset_column_information
+      end
+
+      def teardown
+        super
+        connection.drop_table :test_models rescue nil
+      end
+
+      private
+      def add_column(*args)
+        connection.add_column(*args)
+      end
+
+      def remove_column(*args)
+        connection.remove_column(*args)
+      end
+
+      def rename_column(*args)
+        connection.rename_column(*args)
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/migration/rename_column_test.rb b/activerecord/test/cases/migration/rename_column_test.rb
new file mode 100644
index 0000000000..abebd44f15
--- /dev/null
+++ b/activerecord/test/cases/migration/rename_column_test.rb
@@ -0,0 +1,53 @@
+require "cases/migration/helper"
+
+module ActiveRecord
+  class Migration
+    class RenameColumnTest < ActiveRecord::TestCase
+      include ActiveRecord::Migration::TestHelper
+
+      self.use_transactional_fixtures = false
+
+      # FIXME: this is more of an integration test with AR::Base and the
+      # schema modifications.  Maybe we should move this?
+      def test_add_rename
+        add_column "test_models", "girlfriend", :string
+        TestModel.reset_column_information
+
+        TestModel.create :girlfriend => 'bobette'
+
+        rename_column "test_models", "girlfriend", "exgirlfriend"
+
+        TestModel.reset_column_information
+        bob = TestModel.find(:first)
+
+        assert_equal "bobette", bob.exgirlfriend
+      end
+
+      # FIXME: another integration test.  We should decouple this from the
+      # AR::Base implementation.
+      def test_rename_column_using_symbol_arguments
+        add_column :test_models, :first_name, :string
+
+        TestModel.create :first_name => 'foo'
+
+        rename_column :test_models, :first_name, :nick_name
+        TestModel.reset_column_information
+        assert TestModel.column_names.include?("nick_name")
+        assert_equal ['foo'], TestModel.find(:all).map(&:nick_name)
+      end
+
+      # FIXME: another integration test.  We should decouple this from the
+      # AR::Base implementation.
+      def test_rename_column
+        add_column "test_models", "first_name", "string"
+
+        TestModel.create :first_name => 'foo'
+
+        rename_column "test_models", "first_name", "nick_name"
+        TestModel.reset_column_information
+        assert TestModel.column_names.include?("nick_name")
+        assert_equal ['foo'], TestModel.find(:all).map(&:nick_name)
+      end
+    end
+  end
+end