Don't define a default primary key in the schema dumper.

[#1908 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

activerecord/lib/active_record/schema_dumper.rb

@@ -84,7 +84,6 @@ def table(table, stream)
           elsif @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
           end
-          pk ||= 'id'
 
           tbl.print "  create_table #{table.inspect}"
           if columns.detect { |c| c.name == pk }
@@ -180,4 +179,4 @@ def indexes(table, stream)
         end
       end
   end
-end
+end

activerecord/test/cases/schema_dumper_test.rb

@@ -190,4 +190,12 @@ def test_schema_dump_includes_decimal_options
     output = stream.string
     assert_match %r{:precision => 3,[[:space:]]+:scale => 2,[[:space:]]+:default => 2.78}, output
   end
+
+  def test_schema_dump_keeps_id_column_when_id_is_false_and_id_column_added
+    output = standard_dump
+    match = output.match(%r{create_table "goofy_string_id"(.*)do.*\n(.*)\n})
+    assert_not_nil(match, "goofy_string_id table not found")
+    assert_match %r(:id => false), match[1], "no table id not preserved"
+    assert_match %r{t.string[[:space:]]+"id",[[:space:]]+:null => false$}, match[2], "non-primary key id column not preserved"
+  end
 end