diff options
| author | Graeme Porteous <graeme@rgbp.co.uk> | 2009-07-11 20:04:18 +0200 |
|---|---|---|
| committer | Eloy Duran <eloy.de.enige@gmail.com> | 2009-09-12 16:03:32 +0200 |
| commit | c01be9de322ba846923340e41e69821d01541610 (patch) | |
| tree | e73d2aea62c53df7d1373f011ecfcd9abb70ae43 /activerecord/test/models | |
| parent | 3091252abaafd15bc085f0be2b17829bebb6522c (diff) | |
| download | rails-c01be9de322ba846923340e41e69821d01541610.tar.gz rails-c01be9de322ba846923340e41e69821d01541610.tar.bz2 rails-c01be9de322ba846923340e41e69821d01541610.zip | |
Fix has_one with foreign_key and primary_key association bug which caused the associated object being lost when saving the owner. [#1756 state:resolved]
Mixed in a bit from patch by ransom-briggs. [#2813 state:resolved]
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
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 d69152ec34..b1a3930e4e 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -78,6 +78,7 @@ class Firm < Company # added order by id as in fixtures there are two accounts for Rails Core # Oracle tests were failing because of that as the second fixture was selected has_one :account_using_primary_key, :primary_key => "firm_id", :class_name => "Account", :order => "id" + has_one :account_using_foreign_and_primary_keys, :foreign_key => "firm_name", :primary_key => "name", :class_name => "Account" has_one :deletable_account, :foreign_key => "firm_id", :class_name => "Account", :dependent => :delete has_one :unautosaved_account, :foreign_key => "firm_id", :class_name => 'Account', :autosave => false |