1 files changed, 29 insertions, 32 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 51ddd406ed..f43483d291 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -92,6 +92,7 @@ class PrimaryKeysTest < ActiveRecord::TestCase
   end
 
   def test_primary_key_prefix
+    old_primary_key_prefix_type = ActiveRecord::Base.primary_key_prefix_type
     ActiveRecord::Base.primary_key_prefix_type = :table_name
     Topic.reset_primary_key
     assert_equal "topicid", Topic.primary_key
@@ -103,6 +104,8 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     ActiveRecord::Base.primary_key_prefix_type = nil
     Topic.reset_primary_key
     assert_equal "id", Topic.primary_key
+  ensure
+    ActiveRecord::Base.primary_key_prefix_type = old_primary_key_prefix_type
   end
 
   def test_delete_should_quote_pkey
@@ -149,38 +152,6 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal k.connection.quote_column_name("foo"), k.quoted_primary_key
   end
 
-  def test_two_models_with_same_table_but_different_primary_key
-    k1 = Class.new(ActiveRecord::Base)
-    k1.table_name = 'posts'
-    k1.primary_key = 'id'
-
-    k2 = Class.new(ActiveRecord::Base)
-    k2.table_name = 'posts'
-    k2.primary_key = 'title'
-
-    assert k1.columns.find { |c| c.name == 'id' }.primary
-    assert !k1.columns.find { |c| c.name == 'title' }.primary
-    assert k1.columns_hash['id'].primary
-    assert !k1.columns_hash['title'].primary
-
-    assert !k2.columns.find { |c| c.name == 'id' }.primary
-    assert k2.columns.find { |c| c.name == 'title' }.primary
-    assert !k2.columns_hash['id'].primary
-    assert k2.columns_hash['title'].primary
-  end
-
-  def test_models_with_same_table_have_different_columns
-    k1 = Class.new(ActiveRecord::Base)
-    k1.table_name = 'posts'
-
-    k2 = Class.new(ActiveRecord::Base)
-    k2.table_name = 'posts'
-
-    k1.columns.zip(k2.columns).each do |col1, col2|
-      assert !col1.equal?(col2)
-    end
-  end
-
   def test_auto_detect_primary_key_from_schema
     MixedCaseMonkey.reset_primary_key
     assert_equal "monkeyID", MixedCaseMonkey.primary_key
@@ -219,3 +190,29 @@ if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
     end
   end
 end
+
+if current_adapter?(:PostgreSQLAdapter)
+  class PrimaryKeyBigSerialTest < ActiveRecord::TestCase
+    self.use_transactional_fixtures = false
+
+    class Widget < ActiveRecord::Base
+    end
+
+    setup do
+      @connection = ActiveRecord::Base.connection
+      @connection.create_table(:widgets, id: :bigserial) { |t| }
+    end
+
+    teardown do
+      @connection.drop_table :widgets
+    end
+
+    def test_bigserial_primary_key
+      assert_equal "id", Widget.primary_key
+      assert_equal :integer, Widget.columns_hash[Widget.primary_key].type
+
+      widget = Widget.create!
+      assert_not_nil widget.id
+    end
+  end
+end