diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-22 21:04:32 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-22 21:04:32 -0700 |
| commit | ea4e021dceea10ba1b98ac9b33e36cabf735ce82 (patch) | |
| tree | 72974490c032f9a753f3fc41d335a049c8abbc05 /activerecord/test/models | |
| parent | b714140f4df50d102e70b0151bbb3a09e470d61a (diff) | |
| parent | b332891b2ab4188e9d39737f4d214812afa3ce2c (diff) | |
| download | rails-ea4e021dceea10ba1b98ac9b33e36cabf735ce82.tar.gz rails-ea4e021dceea10ba1b98ac9b33e36cabf735ce82.tar.bz2 rails-ea4e021dceea10ba1b98ac9b33e36cabf735ce82.zip | |
Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/company.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 5c95b21428..f8e259fdfe 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -104,7 +104,7 @@ class Firm < Company end class DependentFirm < Company - has_one :account, :foreign_key => "firm_id", :dependent => :nullify + has_one :account, :foreign_key => "firm_id", :dependent => :nullify, :order => "accounts.id" has_many :companies, :foreign_key => 'client_of', :dependent => :nullify end |