diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
| commit | 5df076ad0965dc684afff8a019fd9f92a53ada76 (patch) | |
| tree | b2272d3d7f0ed6713d888390a13b130c65aec6f3 /activerecord/test/models/organization.rb | |
| parent | ac9443ed71bf0b40cf5b321e8e1b77b98abd9b5e (diff) | |
| parent | 9772de8d459960cc114c5b214343b7ce08fea21c (diff) | |
| download | rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.gz rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.bz2 rails-5df076ad0965dc684afff8a019fd9f92a53ada76.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/test/models/organization.rb')
| -rw-r--r-- | activerecord/test/models/organization.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/models/organization.rb b/activerecord/test/models/organization.rb index 1da342a0bd..4a4111833f 100644 --- a/activerecord/test/models/organization.rb +++ b/activerecord/test/models/organization.rb @@ -2,5 +2,11 @@ class Organization < ActiveRecord::Base has_many :member_details has_many :members, :through => :member_details + has_many :authors, :primary_key => :name + has_many :author_essay_categories, :through => :authors, :source => :essay_categories + + has_one :author, :primary_key => :name + has_one :author_owned_essay_category, :through => :author, :source => :owned_essay_category + scope :clubs, { :from => 'clubs' } -end
\ No newline at end of file +end |