From ea6ebcfe01b7ada3d0932978465fc6899886dd17 Mon Sep 17 00:00:00 2001 From: Ryan Carver Date: Thu, 28 Aug 2008 15:32:11 -0700 Subject: [PATCH] A more flexible way of dumping the primary_key state. --- activerecord/lib/active_record/schema_dumper.rb | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index b90ed88..72fd365 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -79,16 +79,15 @@ HEADER if @connection.respond_to?(:pk_and_sequence_for) pk, pk_seq = @connection.pk_and_sequence_for(table) end - pk ||= 'id' tbl.print " create_table #{table.inspect}" - if columns.detect { |c| c.name == pk } - if pk != 'id' - tbl.print %Q(, :primary_key => "#{pk}") - end + if pk + tbl.print ", :primary_key => #{pk.inspect}" unless pk == "id" else tbl.print ", :id => false" end + pk ||= "id" + tbl.print ", :force => true" tbl.puts " do |t|" -- 1.5.6.5