Merge pull request #10505 from patricksrobertson/bigserial_id_not_identifying_pk

Handle other pk types in PostgreSQL gracefully.

Closes #10505.

- rebased
- test slightly modified

3 files changed, 33 insertions, 1 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f40fe33bcd..99f9f9d094 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Allow the PostgreSQL adapter to handle bigserial pk types again.
+
+    Fixes #10410.
+
+    *Patrick Robertson*
+
 *   Deprecate joining, eager loading and preloading of instance dependent
     associations without replacement. These operations happen before instances
     are created. The current behavior is unexpected and can result in broken
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index e7169bd357..d26e0b7635 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -12,7 +12,7 @@ module ActiveRecord
 
         def visit_ColumnDefinition(o)
           sql = super
-          if o.primary_key? && o.type == :uuid
+          if o.primary_key? && o.type != :primary_key
             sql << " PRIMARY KEY "
             add_column_options!(sql, column_options(o))
           end
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 51ddd406ed..56d0dd6a77 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -219,3 +219,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