aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/fixtures/company.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-06-10 13:54:58 +0000
committerJamis Buck <jamis@37signals.com>2005-06-10 13:54:58 +0000
commit7f9ffb2ebf1a0230368f54a6372cb7196c90177e (patch)
tree6cfa7b09101c91f9d30a656c1796d77b12efe507 /activerecord/test/fixtures/company.rb
parentf6ec9e3d66a8f5acd5eb79e3d1f77a2d1e1b5d31 (diff)
downloadrails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.tar.gz
rails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.tar.bz2
rails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.zip
Eager loading of dependent has_one associations won't delete the association #1212. Also, starting to refactor the tests to make them speedier, with optional support for transactional fixtures.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1398 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures/company.rb')
-rwxr-xr-xactiverecord/test/fixtures/company.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb
index d4bdd7982e..c7655fb1dd 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/fixtures/company.rb
@@ -21,7 +21,7 @@ class Firm < Company
:finder_sql => 'SELECT * FROM companies WHERE client_of = 1000',
:counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
- has_one :account, :dependent => true
+ has_one :account, :foreign_key => "firm_id", :dependent => true
end
class Client < Company