diff options
| author | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-26 23:26:37 +0000 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-01 00:13:10 -0800 |
| commit | 27cfeb7cbcc725c36053833ca8e12cc26357a170 (patch) | |
| tree | 2cf3fe4ee5239b4806c184dbb7840717d4583b50 /activerecord/test | |
| parent | 3825f173d9f2ff3ecf1563e188a9ad638da9f82d (diff) | |
| download | rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.tar.gz rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.tar.bz2 rails-27cfeb7cbcc725c36053833ca8e12cc26357a170.zip | |
Fix :include of has_one with :primary_key option
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index ff3d6ece05..14099d4176 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -803,4 +803,20 @@ class EagerAssociationTest < ActiveRecord::TestCase end end + def test_preload_has_one_using_primary_key + expected = Firm.find(:first).account_using_primary_key + firm = Firm.find :first, :include => :account_using_primary_key + assert_no_queries do + assert_equal expected, firm.account_using_primary_key + end + end + + def test_include_has_one_using_primary_key + expected = Firm.find(1).account_using_primary_key + firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1} + assert_no_queries do + assert_equal expected, firm.account_using_primary_key + end + end + end |