Merge pull request #9389 from senny/forwardport_9388

Forwardport #9388 rename/remove column preserves custom PK.

1 files changed, 15 insertions, 1 deletions

diff --git a/activerecord/test/cases/migration/rename_column_test.rb b/activerecord/test/cases/migration/columns_test.rb
index 88bea2211d..05e93986ef 100644
--- a/activerecord/test/cases/migration/rename_column_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -128,7 +128,7 @@ module ActiveRecord
         assert_equal 1, connection.indexes('test_models').size
         remove_column("test_models", "hat_size")
 
-        # Every database and/or database adapter has their own behavior 
+        # Every database and/or database adapter has their own behavior
         # if it drops the multi-column index when any of the indexed columns dropped by remove_column.
         if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
           assert_equal [], connection.indexes('test_models').map(&:name)
@@ -245,6 +245,20 @@ module ActiveRecord
       def test_remove_column_no_second_parameter_raises_exception
         assert_raise(ArgumentError) { connection.remove_column("funny") }
       end
+
+      def test_removing_and_renaming_column_preserves_custom_primary_key
+        connection.create_table "my_table", primary_key: "my_table_id", force: true do |t|
+          t.integer "col_one"
+          t.string "col_two", limit: 128, null: false
+        end
+
+        remove_column("my_table", "col_two")
+        rename_column("my_table", "col_one", "col_three")
+
+        assert_equal 'my_table_id', connection.primary_key('my_table')
+      ensure
+        connection.drop_table(:my_table) rescue nil
+      end
     end
   end
 end