aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2010-10-12 17:27:10 +0100
committerJon Leighton <j@jonathanleighton.com>2010-10-12 17:27:10 +0100
commitdc39aceb94fa810f8d7e263c0293f325fbf9a109 (patch)
tree29f60704ab32c613f785ff86b4c4f7a54b265570 /activerecord/test/models
parent61073861856110b4a842a4d5e1033698fd52901f (diff)
downloadrails-dc39aceb94fa810f8d7e263c0293f325fbf9a109.tar.gz
rails-dc39aceb94fa810f8d7e263c0293f325fbf9a109.tar.bz2
rails-dc39aceb94fa810f8d7e263c0293f325fbf9a109.zip
Adding test_has_many_through_has_one_with_has_many_through_source_reflection and modifying ThroughAssociationScope to make it work correctly.
Diffstat (limited to 'activerecord/test/models')
-rw-r--r--activerecord/test/models/member.rb2
-rw-r--r--activerecord/test/models/member_detail.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb
index c2dd9efe3b..1113ef3e28 100644
--- a/activerecord/test/models/member.rb
+++ b/activerecord/test/models/member.rb
@@ -15,4 +15,6 @@ class Member < ActiveRecord::Base
has_many :nested_sponsors, :through => :sponsor_club, :source => :sponsor
has_one :nested_sponsor, :through => :sponsor_club, :source => :sponsor
+
+ has_many :organization_member_details, :through => :member_detail
end
diff --git a/activerecord/test/models/member_detail.rb b/activerecord/test/models/member_detail.rb
index 94f59e5794..0f53b69ced 100644
--- a/activerecord/test/models/member_detail.rb
+++ b/activerecord/test/models/member_detail.rb
@@ -2,4 +2,6 @@ class MemberDetail < ActiveRecord::Base
belongs_to :member
belongs_to :organization
has_one :member_type, :through => :member
+
+ has_many :organization_member_details, :through => :organization, :source => :member_details
end