From 0f5104d7208b706e9a0353d3d4ccb20683e81bde Mon Sep 17 00:00:00 2001
From: Brian Samson <brian@briansamson.com>
Date: Thu, 24 Nov 2011 13:11:33 -0700
Subject: load has_many associations keyed off a custom primary key if that key
 is present but the record is unsaved

---
 .../associations/has_many_associations_test.rb     | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases/associations')

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index a60af7c046..88d7d47aea 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -8,6 +8,7 @@ require 'models/reply'
 require 'models/category'
 require 'models/post'
 require 'models/author'
+require 'models/essay'
 require 'models/comment'
 require 'models/person'
 require 'models/reader'
@@ -61,7 +62,7 @@ end
 class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :categories, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments,
-           :people, :posts, :readers, :taggings, :cars
+           :people, :posts, :readers, :taggings, :cars, :essays
 
   def setup
     Client.destroyed_client_ids.clear
@@ -1390,6 +1391,32 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
       firm.clients.last
     end
   end
+  
+  def test_custom_primary_key_on_new_record_should_fetch_with_query
+    author = Author.new(:name => "David")
+    assert !author.essays.loaded?
+    
+    assert_queries 1 do 
+      assert_equal 1, author.essays.size
+    end
+    
+    assert_equal author.essays, Essay.find_all_by_writer_id("David")
+    
+  end
+  
+  def test_has_many_custom_primary_key
+    david = authors(:david)
+    assert_equal david.essays, Essay.find_all_by_writer_id("David")
+  end
+  
+  def test_blank_custom_primary_key_on_new_record_should_not_run_queries
+    author = Author.new
+    assert !author.essays.loaded?
+    
+    assert_queries 0 do 
+      assert_equal 0, author.essays.size
+    end
+  end
 
   def test_calling_first_or_last_with_find_options_on_loaded_association_should_fetch_with_query
     firm = companies(:first_firm)
-- 
cgit v1.2.3