diff options
| author | Denis Odorcic <denis.odorcic@gmail.com> | 2010-10-21 00:23:05 -0400 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-30 11:24:36 -0700 |
| commit | cc9742920ccaf8e985fbe5239edb966949eb91c3 (patch) | |
| tree | ae262c6822264aa10ca6a4599471aeb70ecd2e67 /activerecord/test/cases | |
| parent | 67a3a702951dae905b6270d652dbd14853b01c26 (diff) | |
| download | rails-cc9742920ccaf8e985fbe5239edb966949eb91c3.tar.gz rails-cc9742920ccaf8e985fbe5239edb966949eb91c3.tar.bz2 rails-cc9742920ccaf8e985fbe5239edb966949eb91c3.zip | |
Convert :primary_key in association to a string before comparing to column names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved]
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index cbaa4990f7..0fa4328826 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -81,6 +81,13 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_not_nil citibank_result.instance_variable_get("@firm_with_primary_key") end + def test_eager_loading_with_primary_key_as_symbol + Firm.create("name" => "Apple") + Client.create("name" => "Citibank", :firm_name => "Apple") + citibank_result = Client.find(:first, :conditions => {:name => "Citibank"}, :include => :firm_with_primary_key_symbols) + assert_not_nil citibank_result.instance_variable_get("@firm_with_primary_key_symbols") + end + def test_no_unexpected_aliasing first_firm = companies(:first_firm) another_firm = companies(:another_firm) |