diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
| commit | eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3 (patch) | |
| tree | 3b193dba9756b45e1a0a70d47faa4c3e2ff946a9 /activerecord/test/models/member.rb | |
| parent | 1304b664924bfea54fd6dc0dc924ae3d126ff92d (diff) | |
| parent | 4f984c9d0e66601a81cb5ae6e3b50582e6dc0c2d (diff) | |
| download | rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.gz rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.bz2 rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'activerecord/test/models/member.rb')
| -rw-r--r-- | activerecord/test/models/member.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb index 688725f200..77a37abb38 100644 --- a/activerecord/test/models/member.rb +++ b/activerecord/test/models/member.rb @@ -6,4 +6,6 @@ class Member < ActiveRecord::Base has_one :favourite_club, :through => :memberships, :conditions => ["memberships.favourite = ?", true], :source => :club has_one :sponsor, :as => :sponsorable has_one :sponsor_club, :through => :sponsor + has_one :member_detail + has_one :organization, :through => :member_detail end
\ No newline at end of file |