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/models | |
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/models')
-rw-r--r-- | activerecord/test/models/company.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index be6dd71e3b..ee5f77b613 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -107,6 +107,7 @@ class Client < Company belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of" belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1] belongs_to :firm_with_primary_key, :class_name => "Firm", :primary_key => "name", :foreign_key => "firm_name" + belongs_to :firm_with_primary_key_symbols, :class_name => "Firm", :primary_key => :name, :foreign_key => :firm_name belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true # Record destruction so we can test whether firm.clients.clear has |