diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-19 14:17:29 +0000 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-23 15:19:17 -0800 |
| commit | c6db37e69b1ff07f7ad535d4752d0e6eb2d15bff (patch) | |
| tree | 1f9540d4f14cf67b1277d8e7cd1f658561a79831 /activerecord/test/models | |
| parent | d6efd3cfc2c6d6822aeac550852c49135fbe46c7 (diff) | |
| download | rails-c6db37e69b1ff07f7ad535d4752d0e6eb2d15bff.tar.gz rails-c6db37e69b1ff07f7ad535d4752d0e6eb2d15bff.tar.bz2 rails-c6db37e69b1ff07f7ad535d4752d0e6eb2d15bff.zip | |
Don't allow a has_one association to go :through a collection association [#2976 state:resolved]
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/author.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/models/member.rb | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb index fd6d2b384a..244c5ac4f5 100644 --- a/activerecord/test/models/author.rb +++ b/activerecord/test/models/author.rb @@ -28,7 +28,9 @@ class Author < ActiveRecord::Base has_many :first_posts has_many :comments_on_first_posts, :through => :first_posts, :source => :comments, :order => 'posts.id desc, comments.id asc' - has_one :comment_on_first_posts, :through => :first_posts, :source => :comments, :order => 'posts.id desc, comments.id asc' + + has_one :first_post + has_one :comment_on_first_post, :through => :first_post, :source => :comments, :order => 'posts.id desc, comments.id asc' has_many :thinking_posts, :class_name => 'Post', :conditions => { :title => 'So I was thinking' }, :dependent => :delete_all has_many :welcome_posts, :class_name => 'Post', :conditions => { :title => 'Welcome to the weblog' } diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb index 255fb569d7..5b0a5ebf7f 100644 --- a/activerecord/test/models/member.rb +++ b/activerecord/test/models/member.rb @@ -1,12 +1,15 @@ class Member < ActiveRecord::Base has_one :current_membership - has_many :memberships + has_one :membership has_many :fellow_members, :through => :club, :source => :members has_one :club, :through => :current_membership - has_one :favourite_club, :through => :memberships, :conditions => ["memberships.favourite = ?", true], :source => :club + has_one :favourite_club, :through => :membership, :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 belongs_to :member_type -end
\ No newline at end of file + + has_many :current_memberships + has_one :club_through_many, :through => :current_memberships, :source => :club +end |