0
@@ -180,7 +180,10 @@ module ActiveRecord
0
             record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
0
             record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
0
           else
0
-            record[@reflection.primary_key_name] = @owner.id unless @owner.new_record?
0
+            unless @owner.new_record?
0
+              primary_key = @reflection.options[:primary_key] || :id
0
+              record[@reflection.primary_key_name] = @owner.send(primary_key)
0
+            end
0
           end
0
         end
0
 

0
@@ -1115,5 +1115,11 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
0
     assert !client_association.respond_to?(:private_method)
0
     assert client_association.respond_to?(:private_method, true)
0
   end
0
+
0
+  def test_creating_using_primary_key
0
+    firm = Firm.find(:first)
0
+    client = firm.clients_using_primary_key.create!(:name => 'test')
0
+    assert_equal firm.name, client.firm_name
0
+  end
0
 end
0