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/fixtures | |
| 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/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/accounts.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/fixtures/accounts.yml b/activerecord/test/fixtures/accounts.yml index b2d0191900..32583042a8 100644 --- a/activerecord/test/fixtures/accounts.yml +++ b/activerecord/test/fixtures/accounts.yml @@ -2,6 +2,7 @@ signals37: id: 1 firm_id: 1 credit_limit: 50 + firm_name: 37signals unknown: id: 2 |