1 files changed, 18 insertions, 21 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
index b82bdb8b0c..c20baf655c 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_dumper.rb
@@ -3,16 +3,9 @@ module ActiveRecord
     module PostgreSQL
       module ColumnDumper
         def column_spec_for_primary_key(column)
-          spec = {}
-          if column.serial?
-            return unless column.bigint?
-            spec[:id] = ':bigserial'
-          elsif column.type == :uuid
-            spec[:id] = ':uuid'
-            spec[:default] = schema_default(column) || 'nil'
-          else
-            spec[:id] = schema_type(column).inspect
-            spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type, :null].include?(key) })
+          spec = super
+          if schema_type(column) == :uuid
+            spec[:default] ||= "nil"
           end
           spec
         end
@@ -20,7 +13,7 @@ module ActiveRecord
         # Adds +:array+ option to the default set
         def prepare_column_options(column)
           spec = super
-          spec[:array] = 'true' if column.array?
+          spec[:array] = "true" if column.array?
           spec
         end
 
@@ -31,19 +24,23 @@ module ActiveRecord
 
         private
 
-        def schema_type(column)
-          return super unless column.serial?
+          def default_primary_key?(column)
+            schema_type(column) == :serial
+          end
+
+          def schema_type(column)
+            return super unless column.serial?
 
-          if column.bigint?
-            :bigserial
-          else
-            :serial
+            if column.bigint?
+              :bigserial
+            else
+              :serial
+            end
           end
-        end
 
-        def schema_expression(column)
-          super unless column.serial?
-        end
+          def schema_expression(column)
+            super unless column.serial?
+          end
       end
     end
   end